commit eacedda0dde25064d61e150eb8eae0114c2df5f9
author Cole Faust <colefaust@google.com> Tue Nov 21 09:29:44 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 21 09:29:44 2023 +0000
tree 9cbe581ae1806697600b9766c6a0b5b82577df02
parent 3014a156b84a468e606d45479c584e622b4f1009
parent ca3255c767d246c635ed9425b23c9ef162c6bd93

Remove multidex version genrules am: 33e676fe0f am: 6255f26462 am: ca3255c767

Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/2839047

Change-Id: I7d4108a6323c3d4f98d4b306fd82d1ff833afff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

instrumentation/Android.bp

diff --git a/instrumentation/Android.bp b/instrumentation/Android.bp
index 7dda1cd..5a0cfb5 100644
--- a/instrumentation/Android.bp
+++ b/instrumentation/Android.bp
@@ -21,29 +21,12 @@
     default_applicable_licenses: ["frameworks_multidex_license"],
 }
 
-genrule {
-    name: "android-support-multidex-instrumentation-version",
-    // use srcs as dependencies, otherwise, this module won't be re-run
-    // during incremental build.
-    srcs: [
-        "src/**/*.java",
-    ],
-    cmd: "echo \"git.version=`cd frameworks/multidex/instrumentation; git log --format=\"%H\" -n 1 || " +
-         "(echo git hash not available; exit 0)`\" > $(genDir)/android-support-multidex-instrumentation.version.txt",
-    out: [
-        "android-support-multidex-instrumentation.version.txt",
-    ],
-}
-
 java_library_static {
     name: "android-support-multidex-instrumentation",
     sdk_version: "4",
     srcs: [
         "src/**/*.java",
     ],
-    java_resources: [
-        ":android-support-multidex-instrumentation-version",
-    ],
     static_libs: [
         "android-support-multidex",
     ],

library/Android.bp

diff --git a/library/Android.bp b/library/Android.bp
index 44813a5..467761a 100644
--- a/library/Android.bp
+++ b/library/Android.bp
@@ -21,23 +21,6 @@
     default_applicable_licenses: ["frameworks_multidex_license"],
 }
 
-genrule {
-    name: "android-support-multidex-version",
-    tools: [
-        "soong_zip",
-    ],
-    // use srcs as dependencies, otherwise, this module won't be re-run
-    // during incremental build.
-    srcs: [
-        "src/**/*.java",
-    ],
-    cmd: "echo \"git.version=`cd frameworks/multidex/library; git log --format=\"%H\" -n 1 || " +
-         "(echo git hash not available; exit 0)`\" > $(genDir)/android-support-multidex.version.txt",
-    out: [
-        "android-support-multidex.version.txt",
-    ],
-}
-
 java_library_static {
     name: "android-support-multidex",
     sdk_version: "15",
@@ -45,9 +28,6 @@
     srcs: [
         "src/**/*.java",
     ],
-    java_resources: [
-        ":android-support-multidex-version",
-    ],
     product_variables: {
         unbundled_build: {
             // Don't build the library in unbundled branches.