Revert "Add support for prebuilt AARs."
master doesn't compile anymore.
This reverts commit f56729250448200834c5c95c86c937e887d73623.
Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
diff --git a/core/package_internal.mk b/core/package_internal.mk
index e2c3cf4..bb458d4 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -192,8 +192,6 @@
rs_compatibility_jni_libs :=
-include $(BUILD_SYSTEM)/android_manifest.mk
-
#################################
include $(BUILD_SYSTEM)/java.mk
#################################
@@ -203,6 +201,8 @@
LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION)
endif
+include $(BUILD_SYSTEM)/android_manifest.mk
+
$(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)
ifneq (,$(filter-out current system_current, $(LOCAL_SDK_VERSION)))