Statically compile appcompat dependencies
For compatibility with existing Makefiles. Also removes *-prebuilts
targets, which should no longer be used anywhere.
Test: tapas OobConfig && make OobConfig
Change-Id: I370f2d8fe5d13bb2c5f20b0ceb824d46bd9d2677
diff --git a/current/Android.mk b/current/Android.mk
index 4a78b80..c3c5b79 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -28,18 +28,7 @@
$(shell find $(LOCAL_PATH)/support -name "*.jar"))
include $(BUILD_MULTI_PREBUILT)
-# Generates the v4 and v13 libraries with static dependencies.
+# Generates the v4, v13, and appcompat libraries with static dependencies.
include $(call all-makefiles-under,$(LOCAL_PATH))
endif # TARGET_BUILD_APPS not empty
-
-# Also set up explicit prebuilts for use in apps.
-include $(CLEAR_VARS)
-SUPPORT_LIBS := \
- $(patsubst $(LOCAL_PATH)/%,%,\
- $(shell find $(LOCAL_PATH)/support -name "*.jar"))
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- $(foreach lib,$(SUPPORT_LIBS),\
- $(basename $(notdir $(lib)))-prebuilt:$(lib))
-SUPPORT_LIBS :=
-include $(BUILD_MULTI_PREBUILT)