From 7f7bbce892d9e8ed45e4ee2ee7dcefc1cd87a763 Mon Sep 17 00:00:00 2001 From: Anuj Joshi Date: Fri, 27 Mar 2020 10:43:08 +0530 Subject: Stop using __DATE__/__TIME__ on all builds Test: mmma external/libaac Bug: 151595970 Change-Id: Icd937cad3e4e2f70a5486cca424544eb410be26f --- Android.bp | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 80a0347..4d52b71 100644 --- a/Android.bp +++ b/Android.bp @@ -23,6 +23,7 @@ cc_library_static { "-Wuninitialized", "-Wno-self-assign", "-Wno-implicit-fallthrough", + "-DSUPPRESS_BUILD_DATE_INFO", ], sanitize: { misc_undefined:[ -- cgit v1.2.3 From b09c5ae9f054cc33ac492f729f845cda61971da0 Mon Sep 17 00:00:00 2001 From: Anuj Joshi Date: Fri, 27 Mar 2020 10:44:41 +0530 Subject: aacdec: Add host support Test: Build libFraunhoferAAC on host Bug: 151595970 Change-Id: I4870251b6fe2143dca6b5eed9c2643705c63952c --- Android.bp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 4d52b71..c0937dd 100644 --- a/Android.bp +++ b/Android.bp @@ -1,6 +1,7 @@ cc_library_static { name: "libFraunhoferAAC", vendor_available: true, + host_supported:true, srcs: [ "libAACdec/src/*.cpp", "libAACenc/src/*.cpp", @@ -52,4 +53,10 @@ cc_library_static { "libSACdec/include", "libSACenc/include", ], + + target: { + darwin: { + enabled: false, + }, + }, } -- cgit v1.2.3 From d40f05a61897c4ba746dd2b383fff0c158026c1f Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 16 Apr 2020 18:48:25 +0900 Subject: 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. Bug: 152655956 Test: m Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d --- Android.bp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index c0937dd..555223b 100644 --- a/Android.bp +++ b/Android.bp @@ -1,7 +1,7 @@ cc_library_static { name: "libFraunhoferAAC", vendor_available: true, - host_supported:true, + host_supported: true, srcs: [ "libAACdec/src/*.cpp", "libAACenc/src/*.cpp", @@ -27,10 +27,10 @@ cc_library_static { "-DSUPPRESS_BUILD_DATE_INFO", ], sanitize: { - misc_undefined:[ - "unsigned-integer-overflow", - "signed-integer-overflow", - "bounds", + misc_undefined: [ + "unsigned-integer-overflow", + "signed-integer-overflow", + "bounds", ], // Enable CFI if this becomes a shared library. // cfi: true, @@ -59,4 +59,11 @@ cc_library_static { enabled: false, }, }, + + apex_available: [ + "//apex_available:platform", + "com.android.bluetooth.updatable", + "com.android.media.swcodec", + ], + min_sdk_version: "29", } -- cgit v1.2.3