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

Commit 4a1f42d7 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718 

* commit '7c7f28e7':
  Add 2nd arch directories for apps
  Set up rules to build prebuilts for TARGET_2ND_ARCH
  Set up rules to build packages for TARGET_2ND_ARCH
parents 5cc096b7 7c7f28e7

core/envsetup.mk

+4 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TA 
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(TARGET_OUT)/lib

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS := $(TARGET_OUT_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT_APPS_PRIVILEGED)



TARGET_OUT_DATA := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)

TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)
@@ -253,6 +255,7 @@ TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages 


$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_DATA_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_APPS := $(TARGET_OUT_DATA_APPS)



TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache
@@ -270,6 +273,7 @@ TARGET_OUT_VENDOR_ETC := $(TARGET_OUT_VENDOR)/etc 


$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR_EXECUTABLES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR_APPS)



TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols

TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin

core/package.mk

+10 −3
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
## be set for you.

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



ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true)

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

else

LOCAL_2ND_ARCH_VAR_PREFIX :=

endif



# If this makefile is being read from within an inheritance,

# use the new values.
@@ -306,7 +311,7 @@ endif # full_classes_jar 
so_suffix := $($(my_prefix)SHLIB_SUFFIX)



jni_shared_libraries := \

    $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

      $(addsuffix $(so_suffix), \

        $(LOCAL_JNI_SHARED_LIBRARIES)))
@@ -325,7 +330,7 @@ $(error LOCAL_SDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, 
    LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME))

endif

jni_shared_libraries += \

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so

endif



# Set the abi directory used by the local JNI shared libraries.
@@ -333,7 +338,7 @@ endif 
# sets where they are stored in the apk.)



ifeq ($(LOCAL_JNI_SHARED_LIBRARIES_ABI),)

    jni_shared_libraries_abi := $(TARGET_CPU_ABI)

    jni_shared_libraries_abi := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)

else

    jni_shared_libraries_abi := $(LOCAL_JNI_SHARED_LIBRARIES_ABI)

endif
@@ -468,3 +473,5 @@ endif # skip_definition 


# Reset internal variables.

all_res_assets :=



LOCAL_2ND_ARCH_VAR_PREFIX :=

core/prebuilt.mk

+12 −1
Original line number Diff line number Diff line
@@ -16,6 +16,15 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) 
$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))

endif



ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true)

# Build for TARGET_ARCH

LOCAL_2ND_ARCH_VAR_PREFIX :=

else

# Build for TARGET_2ND_ARCH

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

endif





# Not much sense to check build prebuilts

LOCAL_DONT_CHECK_MODULE := true
@@ -33,7 +42,7 @@ endif 
ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS))

  # Put the built targets of all shared libraries in a common directory

  # to simplify the link line.

  OVERRIDE_BUILT_MODULE_PATH := $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)

  OVERRIDE_BUILT_MODULE_PATH := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)

endif



ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
@@ -213,3 +222,5 @@ endif # TARGET JAVA_LIBRARIES 
$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)



my_prebuilt_src_file :=



LOCAL_2ND_ARCH_VAR_PREFIX :=