ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Don't generate /etc/classpath in make."

Browse source
This commit is contained in:
satayev 2021-04-22 12:17:56 +00:00 • committed by Gerrit Code Review
commit 51dceaa999
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rootdir/Android.mk
View file

@ -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)

1
rootdir/init.rc
View file

@ -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.