tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DO NOT MERGE Always statically include Support Libraries, move SDK definitions up a dir

Browse source 
Bug: 73250914
Bug: 74248169
Test: make && make cts
Change-Id: Id7198997ac5cacf76fd8ab155a60026d65e420ec
This commit is contained in:
Alan Viverette 2018-03-22 14:07:58 -04:00
parent ff413b1c4b
commit 861475dc71
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/project_definitions.mk
View file

@ -19,6 +19,6 @@
#
#
# Include definitions for Support Library modules, if present.
# Include definitions for prebuilt SDK, if present.
#
-include prebuilts/sdk/current/support/definitions.mk
-include prebuilts/sdk/current/definitions.mk

15
core/support_libraries.mk
View file

@ -35,16 +35,15 @@ support_java_deps :=
# 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 :=