Snap for 11790536 from 3ba9ca07468ea89eca946f4b2f6af2a5880cf607 to sdk-release
Change-Id: I52e0ef361353f435165e51adb19d38646be56d84
diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 01720ba..d366b8f 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -111,28 +111,6 @@
],
}
-genrule {
- name: "android-car-last-released-api",
- srcs: [
- "api/released/*.txt",
- ],
- cmd: "cp -f $$(echo $(in) | tr \" \" \"\\n\" | sort -n | tail -1) $(genDir)/last-released-api.txt",
- out: [
- "last-released-api.txt",
- ],
-}
-
-genrule {
- name: "android-car-last-released-system-api",
- srcs: [
- "api/system-released/*.txt",
- ],
- cmd: "cp -f $$(echo $(in) | tr \" \" \"\\n\" | sort -n | tail -1) $(genDir)/last-released-system-api.txt",
- out: [
- "last-released-system-api.txt",
- ],
-}
-
droidstubs {
name: "android.car-stubs-docs",
defaults: ["android.car-docs-default"],
@@ -142,8 +120,8 @@
installable: false,
check_api: {
last_released: {
- api_file: ":android-car-last-released-api",
- removed_api_file: "api/removed.txt",
+ api_file: ":android.car.api.combined.public.latest",
+ removed_api_file: ":android.car-removed.api.combined.public.latest",
},
current: {
api_file: "api/current.txt",
@@ -151,6 +129,7 @@
},
api_lint: {
enabled: true,
+ new_since: ":android.car.api.combined.public.latest",
baseline_file: "api/lint-baseline.txt",
},
},
@@ -167,8 +146,8 @@
installable: false,
check_api: {
last_released: {
- api_file: ":android-car-last-released-system-api",
- removed_api_file: "api/system-removed.txt",
+ api_file: ":android.car.api.combined.system.latest",
+ removed_api_file: ":android.car-removed.api.combined.system.latest",
},
current: {
api_file: "api/system-current.txt",
@@ -176,6 +155,7 @@
},
api_lint: {
enabled: true,
+ new_since: ":android.car.api.combined.system.latest",
baseline_file: "api/system-lint-baseline.txt",
},
},
@@ -223,7 +203,7 @@
"sdk-dir",
"api-versions-jars-dir",
],
- previous_api: ":android-car-last-released-api",
+ previous_api: ":android.car.api.combined.public.latest",
merge_annotations_dirs: [
"metalava-manual",
],
diff --git a/car-lib/api/system-released/system-2.txt b/car-lib/api/system-released/system-2.txt
deleted file mode 100644
index e69de29..0000000
--- a/car-lib/api/system-released/system-2.txt
+++ /dev/null
diff --git a/car-lib/api/released/3.txt b/prebuilts/1/public/api/android.car-removed.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/1/public/api/android.car-removed.txt
diff --git a/car-lib/api/released/1.txt b/prebuilts/1/public/api/android.car.txt
similarity index 100%
rename from car-lib/api/released/1.txt
rename to prebuilts/1/public/api/android.car.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/2/public/api/android.car-removed.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/2/public/api/android.car-removed.txt
diff --git a/car-lib/api/released/2.txt b/prebuilts/2/public/api/android.car.txt
similarity index 100%
rename from car-lib/api/released/2.txt
rename to prebuilts/2/public/api/android.car.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/2/system/api/android.car-removed.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/2/system/api/android.car-removed.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/2/system/api/android.car.txt
similarity index 100%
rename from car-lib/api/released/3.txt
rename to prebuilts/2/system/api/android.car.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/3/module-lib/api/android.car-removed.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/3/module-lib/api/android.car-removed.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/3/module-lib/api/android.car.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/3/module-lib/api/android.car.txt
diff --git a/prebuilts/3/public/api/android.car-removed.txt b/prebuilts/3/public/api/android.car-removed.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/prebuilts/3/public/api/android.car-removed.txt
@@ -0,0 +1 @@
+
diff --git a/car-lib/api/released/3.txt b/prebuilts/3/public/api/android.car.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/3/public/api/android.car.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/3/system/api/android.car-removed.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/3/system/api/android.car-removed.txt
diff --git a/car-lib/api/released/3.txt b/prebuilts/3/system/api/android.car.txt
similarity index 100%
copy from car-lib/api/released/3.txt
copy to prebuilts/3/system/api/android.car.txt
diff --git a/prebuilts/Android.bp b/prebuilts/Android.bp
new file mode 100644
index 0000000..5ebb5ea
--- /dev/null
+++ b/prebuilts/Android.bp
@@ -0,0 +1,27 @@
+// Copyright (C) 2024 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.
+
+package {
+ default_team: "trendy_team_aaos_framework",
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_apis {
+ name: "car_sdk",
+ api_dirs: [
+ "1",
+ "2",
+ "3",
+ ],
+}
