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

Commit cb7ac9d7 authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Move the logic for creating APEX-related symlinks"

parents 4886a5bd 16e5ae3b

rootdir/Android.mk

+39 −38
Original line number Diff line number Diff line
@@ -24,44 +24,6 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE) 
LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init



# Start of runtime APEX compatibility.

#

# Meta-comment:

# The placing of this section is somewhat arbitrary. The LOCAL_POST_INSTALL_CMD

# entries need to be associated with something that goes into /system.

# init-debug.rc qualifies but it could be anything else in /system until soong

# supports creation of symlinks. http://b/123333111

#

# Keeping the appearance of files/dirs having old locations for apps that have

# come to rely on them.



# http://b/121248172 - create a link from /system/usr/icu to

# /apex/com.android.runtime/etc/icu so that apps can find the ICU .dat file.

# A symlink can't overwrite a directory and the /system/usr/icu directory once

# existed so the required structure must be created whatever we find.

LOCAL_POST_INSTALL_CMD = mkdir -p $(TARGET_OUT)/usr && rm -rf $(TARGET_OUT)/usr/icu

LOCAL_POST_INSTALL_CMD += ; ln -sf /apex/com.android.runtime/etc/icu $(TARGET_OUT)/usr/icu



# TODO(b/124106384): Clean up compat symlinks for ART binaries.

ART_BINARIES= \

  dalvikvm \

  dalvikvm32 \

  dalvikvm64 \

  dex2oat \

  dexdiag \

  dexdump \

  dexlist \

  dexoptanalyzer \

  oatdump \

  profman \



$(foreach b,$(ART_BINARIES), \

  $(eval LOCAL_POST_INSTALL_CMD += \

    ; ln -sf /apex/com.android.runtime/bin/$(b) $(TARGET_OUT)/bin/$(b)) \

)



# End of runtime APEX compatibilty.



include $(BUILD_PREBUILT)



#######################################
@@ -242,6 +204,45 @@ LOCAL_MODULE := ld.config.txt 
LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)



# Start of runtime APEX compatibility.

#

# Meta-comment:

# The placing of this section is somewhat arbitrary. The LOCAL_POST_INSTALL_CMD

# entries need to be associated with something that goes into /system.

# ld.config.txt qualifies but it could be anything else in /system until soong

# supports creation of symlinks. http://b/123333111

#

# Keeping the appearance of files/dirs having old locations for apps that have

# come to rely on them.



# http://b/121248172 - create a link from /system/usr/icu to

# /apex/com.android.runtime/etc/icu so that apps can find the ICU .dat file.

# A symlink can't overwrite a directory and the /system/usr/icu directory once

# existed so the required structure must be created whatever we find.

LOCAL_POST_INSTALL_CMD = mkdir -p $(TARGET_OUT)/usr && rm -rf $(TARGET_OUT)/usr/icu

LOCAL_POST_INSTALL_CMD += ; ln -sf /apex/com.android.runtime/etc/icu $(TARGET_OUT)/usr/icu



# TODO(b/124106384): Clean up compat symlinks for ART binaries.

ART_BINARIES= \

  dalvikvm \

  dalvikvm32 \

  dalvikvm64 \

  dex2oat \

  dexdiag \

  dexdump \

  dexlist \

  dexoptanalyzer \

  oatdump \

  profman \



LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_OUT)/bin

$(foreach b,$(ART_BINARIES), \

  $(eval LOCAL_POST_INSTALL_CMD += \

    ; ln -sf /apex/com.android.runtime/bin/$(b) $(TARGET_OUT)/bin/$(b)) \

)



# End of runtime APEX compatibilty.



ifeq ($(_enforce_vndk_at_runtime),true)



# for VNDK enforced devices