Merge "Rewrite auto prebuilts to external/auto"
diff --git a/30/system/api/android-non-updatable-removed.txt b/30/system/api/android-non-updatable-removed.txt
index ab4c6d1..62a385d 100644
--- a/30/system/api/android-non-updatable-removed.txt
+++ b/30/system/api/android-non-updatable-removed.txt
@@ -166,8 +166,6 @@
package android.telephony {
public final class PreciseDataConnectionState implements android.os.Parcelable {
- method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
- method @Deprecated public int getDataConnectionNetworkType();
}
public class TelephonyManager {
diff --git a/31/public/api/incompatibilities.txt b/31/public/api/android-non-updatable-incompatibilities.txt
similarity index 100%
rename from 31/public/api/incompatibilities.txt
rename to 31/public/api/android-non-updatable-incompatibilities.txt
diff --git a/31/system/api/android-incompatibilities.txt b/31/system/api/android-incompatibilities.txt
new file mode 100644
index 0000000..107da50
--- /dev/null
+++ b/31/system/api/android-incompatibilities.txt
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedDeprecatedMethod: android.bluetooth.BluetoothHeadset#setPriority(android.bluetooth.BluetoothDevice, int):
+ Removed deprecated method android.bluetooth.BluetoothHeadset.setPriority(android.bluetooth.BluetoothDevice,int)
diff --git a/31/system/api/incompatibilities.txt b/31/system/api/android-non-updatable-incompatibilities.txt
similarity index 85%
rename from 31/system/api/incompatibilities.txt
rename to 31/system/api/android-non-updatable-incompatibilities.txt
index 3899a47..ab19333 100644
--- a/31/system/api/incompatibilities.txt
+++ b/31/system/api/android-non-updatable-incompatibilities.txt
@@ -8,6 +8,10 @@
Removed class android.net.CaptivePortalData
RemovedClass: android.net.ConnectivityManager:
Removed class android.net.ConnectivityManager
+RemovedClass: android.net.LinkAddress:
+ Removed class android.net.LinkAddress
+RemovedClass: android.net.LinkProperties:
+ Removed class android.net.LinkProperties
RemovedClass: android.net.IpConfiguration:
Removed class android.net.IpConfiguration
RemovedClass: android.net.IpPrefix:
@@ -18,6 +22,8 @@
Removed class android.net.KeepalivePacketData
RemovedClass: android.net.NattKeepalivePacketData:
Removed class android.net.NattKeepalivePacketData
+RemovedClass: android.net.Network:
+ Removed class android.net.Network
RemovedClass: android.net.NetworkAgent:
Removed class android.net.NetworkAgent
RemovedClass: android.net.NetworkAgentConfig:
@@ -26,6 +32,8 @@
Removed class android.net.NetworkCapabilities
RemovedClass: android.net.NetworkProvider:
Removed class android.net.NetworkProvider
+RemovedClass: android.net.NetworkRequest:
+ Removed class android.net.NetworkRequest
RemovedClass: android.net.RouteInfo:
Removed class android.net.RouteInfo
RemovedClass: android.net.SocketKeepalive:
diff --git a/BUILD.bazel b/BUILD.bazel
index 5c6084c..3669a9a 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,35 +1,33 @@
load("@rules_android//toolchains/android:toolchain.bzl", "android_toolchain")
-exports_files(["tools/linux/bin/aapt2"])
-
android_sdk(
name = "android_sdk",
- aapt = "tools/linux/bin/aapt",
- aapt2 = "tools/linux/bin/aapt2",
+ aapt = "//prebuilts/sdk/tools:linux/bin/aapt",
+ aapt2 = "//prebuilts/sdk/tools:linux/bin/aapt2",
adb = ":fail", # TODO: use system/core/adb ?
- aidl = "tools/linux/bin/aidl",
+ aidl = "//prebuilts/sdk/tools:linux/bin/aidl",
android_jar = "30/public/android.jar",
apksigner = ":apksigner",
- dx = "tools/linux/bin/dx", # TODO: add D8
+ dx = "//prebuilts/sdk/tools:linux/bin/dx", # TODO: add D8
framework_aidl = "30/public/framework.aidl",
- main_dex_classes = "tools/mainDexClasses.rules",
+ main_dex_classes = "//prebuilts/sdk/tools:mainDexClasses.rules",
main_dex_list_creator = ":fail",
proguard = ":fail", # TODO: add R8
shrinked_android_jar = "30/public/android.jar",
visibility = ["//visibility:public"],
- zipalign = "tools/linux/bin/zipalign",
+ zipalign = "//prebuilts/sdk/tools:linux/bin/zipalign",
)
java_import(
name = "dx_jar_import",
- jars = ["tools/linux/lib/dx.jar"],
+ jars = ["//prebuilts/sdk/tools:linux/lib/dx.jar"],
visibility = ["//visibility:public"],
)
java_binary(
name = "apksigner",
main_class = "com.android.apksigner.ApkSignerTool",
- runtime_deps = ["tools/linux/lib/apksigner.jar"],
+ runtime_deps = ["//prebuilts/sdk/tools:linux/lib/apksigner.jar"],
)
toolchain(
@@ -50,7 +48,7 @@
android_toolchain(
name = "android_default",
- aapt2 = "//prebuilts/sdk:tools/linux/bin/aapt2",
+ aapt2 = "//prebuilts/sdk/tools:linux/bin/aapt2",
adb = ":fail",
android_kit = ":fail",
apk_to_bundle_tool = ":fail",
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
new file mode 100644
index 0000000..be231b7
--- /dev/null
+++ b/tools/BUILD.bazel
@@ -0,0 +1,13 @@
+exports_files(
+ [
+ "linux/bin/aapt",
+ "linux/bin/aapt2",
+ "linux/lib/dx.jar",
+ "linux/bin/dx",
+ "linux/bin/aidl",
+ "linux/bin/zipalign",
+ "mainDexClasses.rules",
+ "linux/lib/apksigner.jar",
+ ],
+ visibility = ["//prebuilts/sdk:__pkg__"],
+)
