commit 3e9abfc9779399815a7dc8d492466a1234b7fdcd
author Martin Stjernholm <mast@google.com> Fri Oct 09 22:17:51 2020 +0100
committer Martin Stjernholm <mast@google.com> Fri Oct 23 10:03:13 2020 +0000
tree fd1017f153d3759488914c4d372f543125722ad1
parent 35b132e3377029a356cfbc9e4682e3ebceb83edf

Rename ART release APEX to com.android.art.

Test: Build & boot on AOSP master
Test: `m` on AOSP master, flipping
  PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD between true and false, and
  check out/target/product/bonito/symbols/apex/com.android.art.
Test: art/build/apex/runtests.sh
Test: art/tools/buildbot-build.sh {--host,--target}
Test: art/tools/run-gtests.sh
Test: m test-art-host-gtest
Test: art/test/testrunner/testrunner.py --target --64 --optimizing
Test: m build-art-target-golem
Bug: 169639321
Change-Id: Ic4bb8d6f9988ce99bba326b9c635bd3c01ed74ab
Merged-In: Ic4bb8d6f9988ce99bba326b9c635bd3c01ed74ab

build/Android.common_path.mk

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 5cf7322..7cb88c3 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -113,7 +113,7 @@
 endif
 
 # Release ART APEX, included by default in "user" builds.
-RELEASE_ART_APEX := com.android.art.release
+RELEASE_ART_APEX := com.android.art
 # Debug ART APEX, included by default in "userdebug" and "eng"
 # builds and used in ART device benchmarking.
 DEBUG_ART_APEX := com.android.art.debug

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f364187..71b96f4 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -256,7 +256,7 @@
 // variants nor tools), included in user builds. Also used for
 // storage-constrained devices in userdebug and eng builds.
 art_apex {
-    name: "com.android.art.release",
+    name: "com.android.art",
     defaults: ["com.android.art-defaults"],
     certificate: ":com.android.art.certificate",
 }
@@ -410,7 +410,7 @@
 genrule {
     name: "art-check-release-apex-gen",
     defaults: ["art-check-apex-gen-defaults"],
-    srcs: [":com.android.art.release"],
+    srcs: [":com.android.art"],
     cmd: art_check_apex_gen_stem +
         " --flavor release" +
         " $(in)" +

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 0a9c591..efe12aa 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -1074,7 +1074,7 @@
   # TODO: Add host support.
   # TODO: Add support for flattened APEX packages.
   configs = [
-    {'name': 'com.android.art.release', 'flavor': FLAVOR_RELEASE, 'host': False},
+    {'name': 'com.android.art',         'flavor': FLAVOR_RELEASE, 'host': False},
     {'name': 'com.android.art.debug',   'flavor': FLAVOR_DEBUG,   'host': False},
     {'name': 'com.android.art.testing', 'flavor': FLAVOR_TESTING, 'host': False},
   ]

build/apex/runtests.sh

diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh
index 7e3f40f..8b19780 100755
--- a/build/apex/runtests.sh
+++ b/build/apex/runtests.sh
@@ -133,7 +133,7 @@
 # Test all modules, if possible.
 
 apex_modules=(
-  "com.android.art.release"
+  "com.android.art"
   "com.android.art.debug"
   "com.android.art.testing"
 )
@@ -181,9 +181,9 @@
       art_apex_test_args="$art_apex_test_args --debugfs $ANDROID_HOST_OUT/bin/debugfs"
     fi
     case $apex_module in
-      (*.release) test_only_args="--flavor release";;
       (*.debug)   test_only_args="--flavor debug";;
       (*.testing) test_only_args="--flavor testing";;
+      (*)         test_only_args="--flavor release";;
     esac
   fi
   say "APEX package path: $apex_path"