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

Commit f2472a1d authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 1706eb08 

am: e25fa6da

Change-Id: Iac2edb56374e571a3a741edfa9279a82a63f50f8
parents 9fb4aaa1 e25fa6da

rootdir/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ $(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) 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' $@

rootdir/init.environ.rc.in

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ on early-init 
    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%