From db38a2d64e02d2f0b09ba04c29d9ce99c0153d55 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Mon, 30 Mar 2020 13:23:01 +0900
Subject: [PATCH] Add min_sdk_version:R to updatable apexes

APEXes introduced in R need to set min_sdk_version to ensure that they
are built against correct version(30 or R) of stubs (libc/liblog/...).

Bug: 152655956
Test: /vendor/google/build/build_mainline_modules.sh
Change-Id: I4a893c34b09334eea124266287301e479b9e8a59
---
 apex/extservices/Android.bp        | 1 +
 apex/permission/Android.bp         | 1 +
 apex/sdkextensions/Android.bp      | 1 +
 apex/statsd/Android.bp             | 1 +
 packages/Tethering/apex/Android.bp | 1 +
 5 files changed, 5 insertions(+)

diff --git a/apex/extservices/Android.bp b/apex/extservices/Android.bp
index 021246cc7404b..68350afdac850 100644
--- a/apex/extservices/Android.bp
+++ b/apex/extservices/Android.bp
@@ -21,6 +21,7 @@ apex {
 apex_defaults {
     name: "com.android.extservices-defaults",
     updatable: true,
+    min_sdk_version: "R",
     key: "com.android.extservices.key",
     certificate: ":com.android.extservices.certificate",
     apps: ["ExtServices"],
diff --git a/apex/permission/Android.bp b/apex/permission/Android.bp
index 0171b0d767606..71a52bb216ea1 100644
--- a/apex/permission/Android.bp
+++ b/apex/permission/Android.bp
@@ -21,6 +21,7 @@ apex {
 apex_defaults {
     name: "com.android.permission-defaults",
     updatable: true,
+    min_sdk_version: "R",
     key: "com.android.permission.key",
     certificate: ":com.android.permission.certificate",
     java_libs: [
diff --git a/apex/sdkextensions/Android.bp b/apex/sdkextensions/Android.bp
index 322d5e114541b..fc26e0833b1a6 100644
--- a/apex/sdkextensions/Android.bp
+++ b/apex/sdkextensions/Android.bp
@@ -27,6 +27,7 @@ apex {
 apex_defaults {
     name: "com.android.sdkext-defaults",
     updatable: true,
+    min_sdk_version: "R",
     java_libs: [ "framework-sdkextensions" ],
     prebuilts: [
         "derive_sdk.rc",
diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 2df3eea1494d7..32e13e31eebe5 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -33,6 +33,7 @@ apex_defaults {
     prebuilts: ["com.android.os.statsd.init.rc"],
     name: "com.android.os.statsd-defaults",
     updatable: true,
+    min_sdk_version: "R",
     key: "com.android.os.statsd.key",
     certificate: ":com.android.os.statsd.certificate",
 }
diff --git a/packages/Tethering/apex/Android.bp b/packages/Tethering/apex/Android.bp
index 96a4d20077534..24df5f6960778 100644
--- a/packages/Tethering/apex/Android.bp
+++ b/packages/Tethering/apex/Android.bp
@@ -17,6 +17,7 @@
 apex {
     name: "com.android.tethering",
     updatable: true,
+    min_sdk_version: "R",
     java_libs: ["framework-tethering"],
     apps: ["Tethering"],
     manifest: "manifest.json",