Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1efaf37c authored by Alan Viverette's avatar Alan Viverette
Browse files

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

Bug: 73250914
Bug: 74248169
Test: make && make cts
Change-Id: Id7198997ac5cacf76fd8ab155a60026d65e420ec
parent 7ee78863

core/project_definitions.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -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

core/support_libraries.mk

+7 −8
Original line number Original line Diff line number Diff line
@@ -35,16 +35,15 @@ support_java_deps := 
# its output in the variables support_android_deps and support_java_deps.

# its output in the variables support_android_deps and support_java_deps.

include $(RESOLVE_SUPPORT_LIBRARIES)

include $(RESOLVE_SUPPORT_LIBRARIES)





# Store the expanded dependencies in the appropriate variables. Libraries

# Everything is static, which simplifies resource handling. Don't write to any

# should NEVER statically include Support Library modules with resources.

# vars unless we actually have data, since even an empty ANDROID_LIBRARIES var

# requires an AndroidManifest.xml file!

ifdef support_android_deps

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)

    LOCAL_STATIC_ANDROID_LIBRARIES += $(support_android_deps)

    endif # LOCAL_IS_STATIC_JAVA_LIBRARY

endif #support_android_deps

endif #support_android_deps

ifdef support_java_deps

    LOCAL_STATIC_JAVA_LIBRARIES += $(support_java_deps)

    LOCAL_STATIC_JAVA_LIBRARIES += $(support_java_deps)

endif #support_java_deps





# We have consumed these values. Clean them up.

# We have consumed these values. Clean them up.

support_android_deps :=

support_android_deps :=