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

Commit 59991c71 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes from topic "atest_java_test" 

am: 1d07fbb0

Change-Id: Iac13e55edf4e96126bb6845ef9747c4c1088fcbf
parents 56be4aec 1d07fbb0

core/binary.mk

+3 −5
Original line number Original line Diff line number Diff line
@@ -1608,6 +1608,9 @@ else 
installed_static_library_notice_file_targets :=

installed_static_library_notice_file_targets :=

endif

endif





$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



# Default is -fno-rtti.

# Default is -fno-rtti.

ifeq ($(strip $(LOCAL_RTTI_FLAG)),)

ifeq ($(strip $(LOCAL_RTTI_FLAG)),)

LOCAL_RTTI_FLAG := -fno-rtti

LOCAL_RTTI_FLAG := -fno-rtti
@@ -1813,11 +1816,6 @@ all_libraries := \ 
    $(built_static_libraries) \

    $(built_static_libraries) \

    $(built_whole_libraries)

    $(built_whole_libraries)





# Also depend on the notice files for any static libraries that

# are linked into this module.  This will force them to be installed

# when this module is.

$(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets)



###########################################################

###########################################################

# Export includes

# Export includes

###########################################################

###########################################################

core/java_common.mk

+15 −0
Original line number Original line Diff line number Diff line
@@ -487,6 +487,21 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_sh 
ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \

ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \

    $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)

    $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)







##########################################################

# Copy NOTICE files of transitive static dependencies

# Don't do this in mm, since many of the targets won't exist.

ifeq ($(ONE_SHOT_MAKEFILE),)

installed_static_library_notice_file_targets := \

    $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-JAVA_LIBRARIES-$(lib))

else

installed_static_library_notice_file_targets :=

endif



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



###########################################################

###########################################################

# Verify that all libraries are safe to use

# Verify that all libraries are safe to use

###########################################################

###########################################################