Merge "Deactivate build for oprofile."

aosp-mirror · Mar 4, 2014 · 3722f10 · 3722f10
2 parents 940cf75 + 07f514b
commit 3722f10
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 1 deletion.
diff --git 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 → daemon/Android.mk.bak b/daemon/Android.mk → daemon/Android.mk.bak
diff --git a/libabi/Android.mk → libabi/Android.mk.bak b/libabi/Android.mk → libabi/Android.mk.bak
diff --git a/libdb/Android.mk → libdb/Android.mk.bak b/libdb/Android.mk → libdb/Android.mk.bak
diff --git a/libop/Android.mk → libop/Android.mk.bak b/libop/Android.mk → libop/Android.mk.bak
diff --git a/libopt++/Android.mk → libopt++/Android.mk.bak b/libopt++/Android.mk → libopt++/Android.mk.bak
diff --git a/libpopt/Android.mk → libpopt/Android.mk.bak b/libpopt/Android.mk → libpopt/Android.mk.bak
diff --git a/libpp/Android.mk → libpp/Android.mk.bak b/libpp/Android.mk → libpp/Android.mk.bak
diff --git a/libregex/Android.mk → libregex/Android.mk.bak b/libregex/Android.mk → libregex/Android.mk.bak
diff --git a/libutil++/Android.mk → libutil++/Android.mk.bak b/libutil++/Android.mk → libutil++/Android.mk.bak
diff --git a/libutil/Android.mk → libutil/Android.mk.bak b/libutil/Android.mk → libutil/Android.mk.bak
diff --git a/opcontrol/Android.mk → opcontrol/Android.mk.bak b/opcontrol/Android.mk → opcontrol/Android.mk.bak
diff --git a/pp/Android.mk → pp/Android.mk.bak b/pp/Android.mk → pp/Android.mk.bak