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

Commit ca6e50fa authored by Yo Chiang's avatar Yo Chiang Committed by Gerrit Code Review
Browse files

Merge "Access ALL_MODULES subvars with my_register_name"

parents 203fd770 5814247e

core/executable_prefer_symlink.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ $(call symlink-file,$(my_module_path)/$(my_src_binary_name),$(my_src_binary_name 




# We need this so that the installed files could be picked up based on the

# We need this so that the installed files could be picked up based on the

# local module name

# local module name

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_symlink)

ALL_MODULES.$(my_register_name).INSTALLED += $(my_symlink)





# Create the symlink when you run mm/mmm or "make <module_name>"

# Create the symlink when you run mm/mmm or "make <module_name>"

$(LOCAL_MODULE) : $(my_symlink)

$(LOCAL_MODULE) : $(my_symlink)

core/install_jni_libs_internal.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni 
      $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES))

      $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES))

  my_installed_library := $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))

  my_installed_library := $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))





  ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)

  ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed_library)





  # Create symlink in the app specific lib path

  # Create symlink in the app specific lib path

  # Skip creating this symlink when running the second part of a target sanitization build.

  # Skip creating this symlink when running the second part of a target sanitization build.
@@ -72,7 +72,7 @@ else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni 
        $(my_symlink_target_dir)/$(lib), \

        $(my_symlink_target_dir)/$(lib), \

        $(my_app_lib_path)/$(lib)) \

        $(my_app_lib_path)/$(lib)) \

      $(eval $$(LOCAL_INSTALLED_MODULE) : $$(my_app_lib_path)/$$(lib)) \

      $(eval $$(LOCAL_INSTALLED_MODULE) : $$(my_app_lib_path)/$$(lib)) \

      $(eval ALL_MODULES.$$(LOCAL_MODULE).INSTALLED += $$(my_app_lib_path)/$$(lib)))

      $(eval ALL_MODULES.$(my_register_name).INSTALLED += $$(my_app_lib_path)/$$(lib)))

  endif

  endif





  # Clear jni_shared_libraries to not embed it into the apk.

  # Clear jni_shared_libraries to not embed it into the apk.
@@ -100,7 +100,7 @@ ifdef my_prebuilt_jni_libs 
      my_installed_library := $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))

      my_installed_library := $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))

      $(LOCAL_INSTALLED_MODULE) : $(my_installed_library)

      $(LOCAL_INSTALLED_MODULE) : $(my_installed_library)





      ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)

      ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed_library)

    endif  # my_embed_jni

    endif  # my_embed_jni

  endif  # inner my_prebuilt_jni_libs

  endif  # inner my_prebuilt_jni_libs

endif  # outer my_prebuilt_jni_libs

endif  # outer my_prebuilt_jni_libs

core/java.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ ifdef full_classes_jar 
# allowing it to use the classes.jar as the "stubs" that would be use to link

# allowing it to use the classes.jar as the "stubs" that would be use to link

# against, for the cases where someone needs the jar to link against.

# against, for the cases where someone needs the jar to link against.

$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_stubs_jar)))

$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_stubs_jar)))

ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar)

ALL_MODULES.$(my_register_name).STUBS := $(full_classes_stubs_jar)





# The layers file allows you to enforce a layering between java packages.

# The layers file allows you to enforce a layering between java packages.

# Run build/make/tools/java-layers.py for more details.

# Run build/make/tools/java-layers.py for more details.

core/package_internal.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -629,7 +629,7 @@ $(my_bundle_module): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP) 
      endif  # full_classes_jar

      endif  # full_classes_jar

	$(MERGE_ZIPS) $@ $@.parts/*.zip

	$(MERGE_ZIPS) $@ $@.parts/*.zip

	rm -rf $@.parts

	rm -rf $@.parts

ALL_MODULES.$(LOCAL_MODULE).BUNDLE := $(my_bundle_module)

ALL_MODULES.$(my_register_name).BUNDLE := $(my_bundle_module)





ifdef TARGET_BUILD_APPS

ifdef TARGET_BUILD_APPS

  ifdef LOCAL_DPI_VARIANTS

  ifdef LOCAL_DPI_VARIANTS

core/soong_app_prebuilt.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ endif 
PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag)

PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag)





ifdef LOCAL_SOONG_BUNDLE

ifdef LOCAL_SOONG_BUNDLE

  ALL_MODULES.$(LOCAL_MODULE).BUNDLE := $(LOCAL_SOONG_BUNDLE)

  ALL_MODULES.$(my_register_name).BUNDLE := $(LOCAL_SOONG_BUNDLE)

endif

endif





ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_IS_HOST_MODULE