diff options
| author | 2024-07-23 21:30:11 +0000 | |
|---|---|---|
| committer | 2024-07-23 21:30:11 +0000 | |
| commit | 247b04f003e285149c76967779c6bd3af00162ed (patch) | |
| tree | a0e4ff57fcaf7edbf37b48bd6ad9e561a18454b8 | |
| parent | d1039dd4dd8b83a3d2195243d2cbeee284ef13bf (diff) | |
| parent | f51c1dff8543aad597696573773a03c33197eda2 (diff) | |
Merge "[res] Start using the native's header library" into main
| -rw-r--r-- | libs/androidfw/Android.bp | 3 | ||||
| -rw-r--r-- | tools/aapt2/Android.bp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 2fff4f5e9f7c..a39f30bbad1f 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -44,6 +44,9 @@ cc_defaults { "-Werror", "-Wunreachable-code", ], + header_libs: [ + "native_headers", + ], target: { windows: { // The Windows compiler warns incorrectly for value initialization with {}. diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index 4c8193990feb..3f9016ba4852 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -55,7 +55,10 @@ cc_defaults { cflags: ["-D_DARWIN_UNLIMITED_STREAMS"], }, }, - header_libs: ["jni_headers"], + header_libs: [ + "jni_headers", + "native_headers", + ], static_libs: [ "libandroidfw", "libutils", |