diff options
| author | 2020-04-16 18:48:32 +0900 | |
|---|---|---|
| committer | 2020-05-11 08:33:49 +0000 | |
| commit | 7bcb89317d296296c67b6da2d5a27ecebd9afe19 (patch) | |
| tree | 285caf8b6916009d8b7d46527288fd315d91363b | |
| parent | f9d44007ccd474e4cafeac937b57f89dc1296c5c (diff) | |
Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.
For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.
Exempt-From-Owner-Approval: cherry-pick from aosp
Bug: 152655956
Test: m
Merged-In: Ifea5ed988fad2e0d29271e6e9cbf0e12100b37d9
Change-Id: Ifea5ed988fad2e0d29271e6e9cbf0e12100b37d9
(cherry picked from commit a395c8d9aa8e985d8c45f5dffa6518550a70d9a1)
| -rw-r--r-- | headers/Android.bp | 1 | ||||
| -rw-r--r-- | libs/arect/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 2 | ||||
| -rw-r--r-- | libs/binderthreadstate/Android.bp | 3 | ||||
| -rw-r--r-- | libs/gui/Android.bp | 1 | ||||
| -rw-r--r-- | libs/gui/sysprop/Android.bp | 3 | ||||
| -rw-r--r-- | libs/nativebase/Android.bp | 3 | ||||
| -rw-r--r-- | libs/nativewindow/Android.bp | 1 | ||||
| -rw-r--r-- | libs/ui/Android.bp | 2 | ||||
| -rw-r--r-- | libs/vr/libpdx/Android.bp | 1 |
10 files changed, 16 insertions, 2 deletions
diff --git a/headers/Android.bp b/headers/Android.bp index 82bc8a15f7..53372357e6 100644 --- a/headers/Android.bp +++ b/headers/Android.bp @@ -17,4 +17,5 @@ cc_library_headers { "libutils_headers", "libstagefright_foundation_headers", ], + min_sdk_version: "29", } diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp index 2518b1427d..f66673f6ad 100644 --- a/libs/arect/Android.bp +++ b/libs/arect/Android.bp @@ -35,4 +35,5 @@ cc_library_static { enabled: true, }, }, + min_sdk_version: "29", } diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 72982824f4..db4aba8640 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -28,6 +28,7 @@ cc_library_headers { "libcutils_headers", "libutils_headers", ], + min_sdk_version: "29", } // These interfaces are android-specific implementation unrelated to binder @@ -152,6 +153,7 @@ cc_library { sanitize: { misc_undefined: ["integer"], }, + min_sdk_version: "29", } // AIDL interface between libbinder and framework.jar diff --git a/libs/binderthreadstate/Android.bp b/libs/binderthreadstate/Android.bp index 5eb509c4a0..88752ee87e 100644 --- a/libs/binderthreadstate/Android.bp +++ b/libs/binderthreadstate/Android.bp @@ -22,7 +22,7 @@ cc_library_static { shared_libs: [ "libbinder", - "libhidlbase", // libhwbinder is in here + "libhidlbase", // libhwbinder is in here ], export_include_dirs: ["include"], @@ -31,6 +31,7 @@ cc_library_static { "-Wall", "-Werror", ], + min_sdk_version: "29", } hidl_package_root { diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index 7f57f5dd4e..7976ecb707 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -27,6 +27,7 @@ cc_library_headers { "android.hardware.graphics.bufferqueue@1.0", "android.hardware.graphics.bufferqueue@2.0", ], + min_sdk_version: "29", } cc_library_shared { diff --git a/libs/gui/sysprop/Android.bp b/libs/gui/sysprop/Android.bp index e7f7c1fc86..64b1eacaa2 100644 --- a/libs/gui/sysprop/Android.bp +++ b/libs/gui/sysprop/Android.bp @@ -4,4 +4,7 @@ sysprop_library { api_packages: ["android.sysprop"], property_owner: "Platform", vendor_available: true, + cpp: { + min_sdk_version: "29", + }, } diff --git a/libs/nativebase/Android.bp b/libs/nativebase/Android.bp index 7375a2bc2f..9e7e4a2291 100644 --- a/libs/nativebase/Android.bp +++ b/libs/nativebase/Android.bp @@ -25,5 +25,6 @@ cc_library_headers { windows: { enabled: true, }, - } + }, + min_sdk_version: "29", } diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp index 5baec2f70f..ee006aaaba 100644 --- a/libs/nativewindow/Android.bp +++ b/libs/nativewindow/Android.bp @@ -25,6 +25,7 @@ cc_library_headers { name: "libnativewindow_headers", export_include_dirs: ["include"], vendor_available: true, + min_sdk_version: "29", } ndk_library { diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index 458ee675d8..1ee8c7105c 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -133,6 +133,7 @@ cc_library_shared { "libhardware_headers", "libui_headers", ], + min_sdk_version: "29", } cc_library_headers { @@ -151,6 +152,7 @@ cc_library_headers { export_header_lib_headers: [ "libnativewindow_headers", ], + min_sdk_version: "29", } // defaults to enable VALIDATE_REGIONS traces diff --git a/libs/vr/libpdx/Android.bp b/libs/vr/libpdx/Android.bp index 23a4224e05..24ba83048d 100644 --- a/libs/vr/libpdx/Android.bp +++ b/libs/vr/libpdx/Android.bp @@ -2,6 +2,7 @@ cc_library_headers { name: "libpdx_headers", export_include_dirs: ["private"], vendor_available: true, + min_sdk_version: "29", } cc_library_static { |