Always statically include Support Libraries, move SDK definitions up a dir
Bug: 73250914
Bug: 74248169
Test: make && make cts
Change-Id: Id7198997ac5cacf76fd8ab155a60026d65e420ec
Merged-In: Id7198997ac5cacf76fd8ab155a60026d65e420ec
(cherry picked from commit 1efaf37cb7dda6807f66062ca6bf001f5066e4b4)
diff --git a/core/support_libraries.mk b/core/support_libraries.mk
index e204cc4..f1b86f4 100644
--- a/core/support_libraries.mk
+++ b/core/support_libraries.mk
@@ -35,16 +35,15 @@
# its output in the variables support_android_deps and support_java_deps.
include $(RESOLVE_SUPPORT_LIBRARIES)
-# Store the expanded dependencies in the appropriate variables. Libraries
-# should NEVER statically include Support Library modules with resources.
+# Everything is static, which simplifies resource handling. Don't write to any
+# vars unless we actually have data, since even an empty ANDROID_LIBRARIES var
+# requires an AndroidManifest.xml file!
ifdef support_android_deps
- ifdef LOCAL_IS_STATIC_JAVA_LIBRARY
- LOCAL_SHARED_ANDROID_LIBRARIES += $(support_android_deps)
- else
- LOCAL_STATIC_ANDROID_LIBRARIES += $(support_android_deps)
- endif # LOCAL_IS_STATIC_JAVA_LIBRARY
+ LOCAL_STATIC_ANDROID_LIBRARIES += $(support_android_deps)
endif #support_android_deps
-LOCAL_STATIC_JAVA_LIBRARIES += $(support_java_deps)
+ifdef support_java_deps
+ LOCAL_STATIC_JAVA_LIBRARIES += $(support_java_deps)
+endif #support_java_deps
# We have consumed these values. Clean them up.
support_android_deps :=