commit a4d27de25484b526205b446b8157122dc117b332
author Paul Duffin <paulduffin@google.com> Thu Jul 08 11:33:57 2021 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 08 17:56:40 2021 +0000
tree b36dd5f8a9332fd0f16d2e0fd2d12345964803d0
parent 8782f17c8adcf729a535dc4f9c221b9602b71017

Provide additional target variant of okhttp-norepackage prebuilt

The okhttp-norepackage already provides host prebuilts but the
grpc-grpc-java library needs target variants too.

Bug: 193044041
Test: DIST_DIR=$PWD/dist TARGET_BUILD_VARIANT=userdebug art/build/build-art-module.sh --skip-apex
      packages/modules/ArtPrebuilt/update-art-module-prebuilts.py --local-dist=dist --skip-cls --skip-apex
      - check that odrefresh is added
Change-Id: Id1060fb088d5a0cc0aba2ca161f8f34af463f013

build/sdk/Android.bp

diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 33a98ff..9406a17 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -163,6 +163,11 @@
 
     prebuilt_visibility: prebuilt_visibility,
 
+    java_libs: [
+        // Needed for grpc-grpc-java
+        "okhttp-norepackage",
+    ],
+
     target: {
         host: {
             // Set in target.host because the top level compile_multilib
@@ -172,9 +177,6 @@
 
             java_libs: [
                 "art.module.api.annotations",
-
-                // Needed for grpc-grpc-java
-                "okhttp-norepackage",
             ],
             native_binaries: [
                 "dex2oat",