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

Commit 0a8750b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Change the impl lib name of java_sdk_library"

parents 885787f4 a9f2ef5e

core/dex_preopt_odex_install.mk

+3 −4
Original line number Diff line number Diff line
@@ -122,8 +122,7 @@ ifdef LOCAL_DEX_PREOPT 
  ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

    my_module_multilib := $(LOCAL_MULTILIB)

    # If the module is not an SDK library and it's a system server jar, only preopt the primary arch.

    my_filtered_lib_name := $(patsubst %.impl,%,$(LOCAL_MODULE))

    ifeq (,$(filter $(JAVA_SDK_LIBRARIES),$(my_filtered_lib_name)))

    ifeq (,$(filter $(JAVA_SDK_LIBRARIES),$(LOCAL_MODULE)))

      # For a Java library, by default we build odex for both 1st arch and 2nd arch.

      # But it can be overridden with "LOCAL_MULTILIB := first".

      ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
@@ -192,7 +191,7 @@ ifdef LOCAL_DEX_PREOPT 
  $(call add_json_list, OptionalUsesLibraries,         $(LOCAL_OPTIONAL_USES_LIBRARIES))

  $(call add_json_list, UsesLibraries,                 $(LOCAL_USES_LIBRARIES))

  $(call add_json_map,  LibraryPaths)

  $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy.impl android.hidl.base-V1.0-java android.hidl.manager-V1.0-java),\

  $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy android.hidl.base-V1.0-java android.hidl.manager-V1.0-java),\

    $(call add_json_str, $(lib), $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar))

  $(call end_json_map)

  $(call add_json_list, Archs,                         $(my_dexpreopt_archs))
@@ -234,7 +233,7 @@ ifdef LOCAL_DEX_PREOPT 
  my_dexpreopt_deps := $(my_dex_jar)

  my_dexpreopt_deps += $(if $(my_process_profile),$(LOCAL_DEX_PREOPT_PROFILE))

  my_dexpreopt_deps += \

    $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy.impl android.hidl.base-V1.0-java android.hidl.manager-V1.0-java),\

    $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy android.hidl.base-V1.0-java android.hidl.manager-V1.0-java),\

      $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar)

  my_dexpreopt_deps += $(LOCAL_DEX_PREOPT_IMAGE_LOCATION)

  # TODO: default boot images

core/java_common.mk

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ ifndef LOCAL_IS_HOST_MODULE 
      sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(call resolve-prebuilt-sdk-module,system_current,$(lib_name)))

    else

      # When SDK libraries are referenced from modules built without SDK, provide the all APIs to them

      sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(lib_name).impl)

      sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(lib_name))

    endif

  else

    ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

target/product/base_system.mk

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ ifeq ($(REMOVE_OAHL_FROM_BCP),true) 
PRODUCT_PACKAGES += framework-oahl-backward-compatibility

PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility

else

PRODUCT_BOOT_JARS += org.apache.http.legacy.impl

PRODUCT_BOOT_JARS += org.apache.http.legacy

endif



PRODUCT_COPY_FILES += \
@@ -308,7 +308,7 @@ ifeq ($(REMOVE_ATB_FROM_BCP),true) 
PRODUCT_PACKAGES += framework-atb-backward-compatibility

PRODUCT_BOOT_JARS += framework-atb-backward-compatibility

else

PRODUCT_BOOT_JARS += android.test.base.impl

PRODUCT_BOOT_JARS += android.test.base

endif



PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc

target/product/media_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
    services \

    ethernet-service \

    wifi-service \

    com.android.location.provider.impl \

    com.android.location.provider \



PRODUCT_COPY_FILES += \

    system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt