Merge "Deactivate build for oprofile."HEADandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1master-soongmastermainlollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-release

13 files changed, 4 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 0a05aed..186b0c0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,4 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(call all-subdir-makefiles)
+# It is non-trivial to retire a project completely from the repository,
+# so we disable the build explicitly here.
+# b/13249790
+#include $(call all-subdir-makefiles)
diff --git a/daemon/Android.mk b/daemon/Android.mk.bak
index fd46707..fd46707 100644
--- a/daemon/Android.mk
+++ b/daemon/Android.mk.bak
diff --git a/libabi/Android.mk b/libabi/Android.mk.bak
index 49b7ca9..49b7ca9 100644
--- a/libabi/Android.mk
+++ b/libabi/Android.mk.bak
diff --git a/libdb/Android.mk b/libdb/Android.mk.bak
index 7f0c645..7f0c645 100644
--- a/libdb/Android.mk
+++ b/libdb/Android.mk.bak
diff --git a/libop/Android.mk b/libop/Android.mk.bak
index 9ad4664..9ad4664 100644
--- a/libop/Android.mk
+++ b/libop/Android.mk.bak
diff --git a/libopt++/Android.mk b/libopt++/Android.mk.bak
index 11938b1..11938b1 100644
--- a/libopt++/Android.mk
+++ b/libopt++/Android.mk.bak
diff --git a/libpopt/Android.mk b/libpopt/Android.mk.bak
index b43753b..b43753b 100644
--- a/libpopt/Android.mk
+++ b/libpopt/Android.mk.bak
diff --git a/libpp/Android.mk b/libpp/Android.mk.bak
index 5bdbafa..5bdbafa 100644
--- a/libpp/Android.mk
+++ b/libpp/Android.mk.bak
diff --git a/libregex/Android.mk b/libregex/Android.mk.bak
index 0d52195..0d52195 100644
--- a/libregex/Android.mk
+++ b/libregex/Android.mk.bak
diff --git a/libutil++/Android.mk b/libutil++/Android.mk.bak
index d6f1045..d6f1045 100644
--- a/libutil++/Android.mk
+++ b/libutil++/Android.mk.bak
diff --git a/libutil/Android.mk b/libutil/Android.mk.bak
index efbd710..efbd710 100644
--- a/libutil/Android.mk
+++ b/libutil/Android.mk.bak
diff --git a/opcontrol/Android.mk b/opcontrol/Android.mk.bak
index bfeedba..bfeedba 100644
--- a/opcontrol/Android.mk
+++ b/opcontrol/Android.mk.bak
diff --git a/pp/Android.mk b/pp/Android.mk.bak
index 36f2b03..36f2b03 100644
--- a/pp/Android.mk
+++ b/pp/Android.mk.bak