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

Commit db712e9f authored by satayev's avatar satayev Committed by Automerger Merge Worker
Browse files

Merge "Export *CLASSPATH variables after apexes are configured." am: 334a9338 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1589513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If536b5244f578228c740b5a1e9f72a637312a166
parents 15108cd4 334a9338

rootdir/Android.mk

+17 −3
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ LOCAL_MODULE := init.environ.rc 
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

LOCAL_REQUIRED_MODULES := etc_classpath



EXPORT_GLOBAL_ASAN_OPTIONS :=

ifneq ($(filter address,$(SANITIZE_TARGET)),)
@@ -171,9 +172,7 @@ include $(BUILD_SYSTEM)/base_rules.mk 
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in

	@echo "Generate: $< -> $@"

	@mkdir -p $(dir $@)

	$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@

	$(hide) sed -i -e 's?%DEX2OATBOOTCLASSPATH%?$(PRODUCT_DEX2OAT_BOOTCLASSPATH)?g' $@

	$(hide) sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $@

	$(hide) cp $< $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_ASAN_OPTIONS%?$(EXPORT_GLOBAL_ASAN_OPTIONS)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%?$(EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS)?g' $@
@@ -186,6 +185,21 @@ $(strip \ 
)

endef



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

# /etc/classpath

include $(CLEAR_VARS)

LOCAL_MODULE := etc_classpath

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := classpath

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo "export BOOTCLASSPATH $(PRODUCT_BOOTCLASSPATH)" > $@

	$(hide) echo "export DEX2OATBOOTCLASSPATH $(PRODUCT_DEX2OAT_BOOTCLASSPATH)" >> $@

	$(hide) echo "export SYSTEMSERVERCLASSPATH $(PRODUCT_SYSTEM_SERVER_CLASSPATH)" >> $@



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

# sanitizer.libraries.txt

include $(CLEAR_VARS)

rootdir/init.environ.rc.in

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ on early-init 
    export ANDROID_TZDATA_ROOT /apex/com.android.tzdata

    export EXTERNAL_STORAGE /sdcard

    export ASEC_MOUNTPOINT /mnt/asec

    export BOOTCLASSPATH %BOOTCLASSPATH%

    export DEX2OATBOOTCLASSPATH %DEX2OATBOOTCLASSPATH%

    export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%

    %EXPORT_GLOBAL_ASAN_OPTIONS%

    %EXPORT_GLOBAL_GCOV_OPTIONS%

    %EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%

rootdir/init.rc

+4 −0
Original line number Diff line number Diff line
@@ -867,6 +867,10 @@ on post-fs-data 
    wait_for_prop apexd.status activated

    perform_apex_config



    # Export *CLASSPATH variables from /etc/classpath

    # TODO(b/180105615): export from the generated file instead.

    load_exports /etc/classpath



    # Special-case /data/media/obb per b/64566063

    mkdir /data/media 0770 media_rw media_rw encryption=None

    exec - media_rw media_rw -- /system/bin/chattr +F /data/media