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

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

Merge "Don't generate /etc/classpath in make." am: 51dceaa9 am: 9f5a2ced am: e71ac65f 

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

Change-Id: If6dd7b5fb1344b9031f3abe0603cd2687606933f
parents 19905fab e71ac65f

rootdir/Android.mk

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

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

LOCAL_REQUIRED_MODULES := etc_classpath





EXPORT_GLOBAL_ASAN_OPTIONS :=

EXPORT_GLOBAL_ASAN_OPTIONS :=

ifneq ($(filter address,$(SANITIZE_TARGET)),)

ifneq ($(filter address,$(SANITIZE_TARGET)),)
@@ -185,21 +184,6 @@ $(strip \ 
)

)

endef

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

# sanitizer.libraries.txt

include $(CLEAR_VARS)

include $(CLEAR_VARS)

rootdir/init.rc

+0 −1
Original line number Original line Diff line number Diff line
@@ -917,7 +917,6 @@ on post-fs-data 
    # Must start before 'odsign', as odsign depends on *CLASSPATH variables

    # Must start before 'odsign', as odsign depends on *CLASSPATH variables

    exec_start derive_classpath

    exec_start derive_classpath

    load_exports /data/system/environ/classpath

    load_exports /data/system/environ/classpath

    rm /data/system/environ/classpath





    # Start the on-device signing daemon, and wait for it to finish, to ensure

    # Start the on-device signing daemon, and wait for it to finish, to ensure

    # ART artifacts are generated if needed.

    # ART artifacts are generated if needed.