DO NOT MERGE - Import AndroidX from build 5646148
am: 78da533b3e
Change-Id: I50efdedbdb61ad8f5d271f0f03f08d1583e6845f
diff --git a/current/Android.bp b/current/Android.bp
new file mode 100644
index 0000000..0fc48b1
--- /dev/null
+++ b/current/Android.bp
@@ -0,0 +1,35 @@
+java_sdk_library_import {
+ name: "android.test.base",
+ jars: ["public/android.test.base.jar"],
+ sdk_version: "current",
+}
+
+java_sdk_library_import {
+ name: "android.test.runner",
+ jars: ["public/android.test.runner.jar"],
+ sdk_version: "current",
+}
+
+java_sdk_library_import {
+ name: "android.test.mock",
+ jars: ["public/android.test.mock.jar"],
+ sdk_version: "current",
+}
+
+java_sdk_library_import {
+ name: "org.apache.http.legacy",
+ jars: ["public/org.apache.http.legacy.jar"],
+ sdk_version: "current",
+}
+
+java_import {
+ name: "android-support-multidex-instrumentation",
+ jars: ["multidex/instrumentation/android-support-multidex-instrumentation.jar"],
+ sdk_version: "current",
+}
+
+java_import {
+ name: "android-support-multidex",
+ jars: ["multidex/library/android-support-multidex.jar"],
+ sdk_version: "current",
+}
diff --git a/current/Android.mk b/current/Android.mk
deleted file mode 100644
index ac2a52a..0000000
--- a/current/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-#########################################
-# The prebuilt support libraries.
-
-include $(CLEAR_VARS)
-
-define define-prebuilt
- $(eval tw := $(subst :, ,$(strip $(1)))) \
- $(eval include $(CLEAR_VARS)) \
- $(eval LOCAL_MODULE := $(word 1,$(tw))) \
- $(eval LOCAL_MODULE_TAGS := optional) \
- $(eval LOCAL_MODULE_CLASS := JAVA_LIBRARIES) \
- $(eval LOCAL_SRC_FILES := $(word 2,$(tw))) \
- $(eval LOCAL_UNINSTALLABLE_MODULE := true) \
- $(eval LOCAL_SDK_VERSION := current) \
- $(eval include $(BUILD_PREBUILT))
-endef
-
-# For apps (unbundled) build, replace the typical
-# make target artifacts with prebuilts.
-ifneq (,$(TARGET_BUILD_APPS_USE_PREBUILT_SDK)$(filter true,$(TARGET_BUILD_PDK)))
- # Set up prebuilts for Multidex library artifacts.
- multidex_jars := \
- $(patsubst $(LOCAL_PATH)/%,%,\
- $(shell find $(LOCAL_PATH)/multidex -name "*.jar"))
- prebuilts := $(foreach jar,$(multidex_jars),\
- $(basename $(notdir $(jar))):$(jar))
-
- # Set up prebuilts for optional libraries. Need to specify them explicitly
- # as the target name does not match the JAR name.
- prebuilts += \
- android.test.base.stubs:public/android.test.base.jar \
- android.test.runner.stubs:public/android.test.runner.jar \
- android.test.mock.stubs:public/android.test.mock.jar \
- org.apache.http.legacy.stubs:public/org.apache.http.legacy.jar
-
- $(foreach p,$(prebuilts),\
- $(call define-prebuilt,$(p)))
-
- prebuilts :=
-endif # TARGET_BUILD_APPS not empty or TARGET_BUILD_PDK set to True
-
-
-# Include all Support Library modules as prebuilts.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/current/public/android.jar b/current/public/android.jar
index ba96df5..8f134e1 100644
--- a/current/public/android.jar
+++ b/current/public/android.jar
Binary files differ
diff --git a/current/system/android.jar b/current/system/android.jar
index 8533a68..dc111d5 100644
--- a/current/system/android.jar
+++ b/current/system/android.jar
Binary files differ
diff --git a/current/test/android.jar b/current/test/android.jar
index 82db20a..24a7186 100644
--- a/current/test/android.jar
+++ b/current/test/android.jar
Binary files differ
diff --git a/tools/darwin/bin/aapt2 b/tools/darwin/bin/aapt2
index 051bd31..167d9cc 100755
--- a/tools/darwin/bin/aapt2
+++ b/tools/darwin/bin/aapt2
Binary files differ
diff --git a/tools/darwin/lib64/libaapt2_jni.dylib b/tools/darwin/lib64/libaapt2_jni.dylib
index 9976bde..5dc097d 100644
--- a/tools/darwin/lib64/libaapt2_jni.dylib
+++ b/tools/darwin/lib64/libaapt2_jni.dylib
Binary files differ
diff --git a/tools/linux/bin/aapt2 b/tools/linux/bin/aapt2
index 3f4cc4c..7912169 100755
--- a/tools/linux/bin/aapt2
+++ b/tools/linux/bin/aapt2
Binary files differ
diff --git a/tools/linux/lib64/libaapt2_jni.so b/tools/linux/lib64/libaapt2_jni.so
index 9a1ff8c..a0e684f 100644
--- a/tools/linux/lib64/libaapt2_jni.so
+++ b/tools/linux/lib64/libaapt2_jni.so
Binary files differ
diff --git a/tools/windows/bin/aapt2.exe b/tools/windows/bin/aapt2.exe
index 48511e8..430a49f 100755
--- a/tools/windows/bin/aapt2.exe
+++ b/tools/windows/bin/aapt2.exe
Binary files differ
diff --git a/tools/windows/bin/libaapt2_jni.dll b/tools/windows/bin/libaapt2_jni.dll
index c810b22..95b6f50 100755
--- a/tools/windows/bin/libaapt2_jni.dll
+++ b/tools/windows/bin/libaapt2_jni.dll
Binary files differ
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index 2b8b796..ca692d4 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -417,7 +417,7 @@
args.extend(["-rewrite=^" + name + "$=" + maven_to_make[name]['name'] for name in rewriteNames])
args.extend(["-rewrite=^com.squareup:javapoet$=javapoet-prebuilt-jar"])
args.extend(["-rewrite=^com.google.guava:listenablefuture$=guava-listenablefuture-prebuilt-jar"])
- args.extend(["-extra-deps=android-support-car=prebuilt-android.car-stubs"])
+ args.extend(["-extra-static-libs=android-support-car=prebuilt-android.car-stubs"])
args.extend(["-host=" + name for name in maven_to_make if maven_to_make[name].get('host')])
# these depend on GSON which is not in AOSP
args.extend(["-exclude=androidx.room_room-migration",