commit c19822c60369a285d836b93db77d77a8ba3380ca
author Yunlong Wang <leon.wang@unisoc.com> Mon Jun 08 20:23:43 2020 +0800
committer Ulyana Trafimovich <skvadrik@google.com> Wed Jun 17 08:49:42 2020 +0000
tree 483e6789c2c47aedd34d48a63ce8b641befaef79
parent 6587d9110bd7f836e43db16f3f676da996218aef

Update generate-boot-image-profile.sh

Update the locations of boot jars.

Fix framework-minus-apex issue related with b/139391334
the real jar name of framework-minus-apex is framework.

Test: art/tools/generate-boot-image-profile.sh boot.prof \
        --profman-arg --boot-image-sampled-method-threshold=1 \
        profiles/cur/0/*/primary.prof

Change-Id: I7f971f29f9d36d064e875467a208d3fcbf355ff5

tools/generate-boot-image-profile.sh

diff --git a/tools/generate-boot-image-profile.sh b/tools/generate-boot-image-profile.sh
index 44c64d2..0c4f29b 100755
--- a/tools/generate-boot-image-profile.sh
+++ b/tools/generate-boot-image-profile.sh
@@ -21,7 +21,7 @@
 if [[ "$#" -lt 2 ]]; then
   echo "Usage $0 <output> <profman args> <profiles>+"
   echo "Also outputs <output>.txt and <output>.preloaded-classes"
-  echo 'Example: generate-boot-image-profile.sh boot.prof --profman-arg --boot-image-sampled-method-threshold=1 profiles/0/*/primary.prof'
+  echo 'Example: generate-boot-image-profile.sh boot.prof --profman-arg --boot-image-sampled-method-threshold=1 profiles/cur/0/*/primary.prof'
   exit 1
 fi
 
@@ -46,13 +46,41 @@
   fi
 done
 
+# b/139391334: the stem of framework-minus-apex is framework
+real_jar_name() {
+  if [[ "$1" == "framework-minus-apex" ]]; then
+    echo "framework"
+  else
+    echo "$1"
+  fi
+}
+
 # Boot jars have hidden API access flags which do not pass dex file
 # verification. Skip it.
 jar_args=()
 boot_jars=$("$ANDROID_BUILD_TOP"/art/tools/bootjars.sh --target)
-jar_dir=$ANDROID_BUILD_TOP/$(get_build_var TARGET_OUT_JAVA_LIBRARIES)
-for file in $boot_jars; do
-  filename="$jar_dir/$file.jar"
+product_out=$ANDROID_BUILD_TOP/$(get_build_var PRODUCT_OUT)
+for pair in $boot_jars; do
+  words=( $(echo $pair | tr ':' ' ') )
+  if [[ ${#words[@]} -eq 2 ]]; then
+    # format in Android > R: <apex>:<jar>
+    apex="${words[0]}"
+    name="$(real_jar_name ${words[1]})"
+    case "$apex" in
+        platform*)   subdir=system/framework ;;
+        system_ext*) subdir=system_ext/framework ;;
+        *)           subdir=apex/$apex/javalib ;;
+    esac
+    filename="$product_out/$subdir/$name.jar"
+  else
+    # format in Android <= R: <jar>, have to infer location with `find`
+    name="$(real_jar_name ${words[0]})"
+    filename="$(find $product_out -name $name.jar 2>/dev/null)"
+    if [[ $(echo "$filename" | wc -w ) -ne 1 ]]; then
+      echo "expected to find $name.jar, got '$filename'"
+      exit 1
+    fi
+  fi
   jar_args+=("--apk=$filename")
   jar_args+=("--dex-location=$filename")
 done