summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Desprez <jdesprez@google.com>2020-11-23 18:40:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-23 18:40:46 +0000
commit09986e36d162a834549d542d47da5ecab166f6fb (patch)
treea187087290875a7629da1f7b71a8cb0eb6d1c93d
parentd1ae7fcf07e09c8aba356b78ae19583683b9af54 (diff)
parent87ccee4a23d5e27c6aef08e57335ffb8b8755640 (diff)
downloadmisc-09986e36d162a834549d542d47da5ecab166f6fb.tar.gz
Merge "Allow prebuilts lib to be host_supported" am: 030749a681 am: 87ccee4a23
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1507781 Change-Id: I1a9115a84db33c4ca7de4b130168ea84e24dac12
-rw-r--r--common/json/Android.bp3
-rw-r--r--common/kxml2/Android.bp3
2 files changed, 4 insertions, 2 deletions
diff --git a/common/json/Android.bp b/common/json/Android.bp
index e7782d8b..209f97d0 100644
--- a/common/json/Android.bp
+++ b/common/json/Android.bp
@@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-java_import_host {
+java_import {
name: "json-prebuilt",
jars: ["json-prebuilt.jar"],
installable: true,
+ host_supported: true,
}
diff --git a/common/kxml2/Android.bp b/common/kxml2/Android.bp
index ee347b20..fde2192f 100644
--- a/common/kxml2/Android.bp
+++ b/common/kxml2/Android.bp
@@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-java_import_host {
+java_import {
name: "kxml2-2.3.0",
jars: ["kxml2-2.3.0.jar"],
installable: true,
+ host_supported: true,
}
java_import {