commit b50b6850b7ad1be8af65f27d061262e8440c023d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 02 05:20:06 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 02 05:20:06 2022 +0000
tree 2f290e9a9a80b5b9fb73e701acce032413a36c67
parent 1ff5e0e34f131f53accad82db24464b4f9583907
parent 458f90272cdb203421c248f9d4f57a5b5dda6968

Merge "sbom_test - use UTC"

finalize-step-1.sh

diff --git a/finalize-step-1.sh b/finalize-step-1.sh
index 9f87b6c..4e3e0c4 100755
--- a/finalize-step-1.sh
+++ b/finalize-step-1.sh
@@ -11,7 +11,7 @@
         git checkout . ; git clean -fdx ;\
         git checkout @ ; git b fina-step1 -D ; git reset --hard; \
         repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;\
-        previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT)" ;\
+        previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;\
         if [[ $previousHash ]]; then git revert --no-commit $previousHash ; fi ;'
 }
 

target/product/aosp_riscv64.mk

diff --git a/target/product/aosp_riscv64.mk b/target/product/aosp_riscv64.mk
index 012cc41..e9de7c8 100644
--- a/target/product/aosp_riscv64.mk
+++ b/target/product/aosp_riscv64.mk
@@ -65,6 +65,9 @@
   linker \
   shell_and_utilities \
 
+$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)
+PRODUCT_USES_DEFAULT_ART_CONFIG := false
+
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     root/init.zygote64.rc