diff options
| author | David Drysdale <drysdale@google.com> | 2024-02-21 14:27:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-21 14:27:24 +0000 |
| commit | c4622c1f2beffc5d4a5ea4da1989d84bc63cc22d (patch) | |
| tree | 833e522293989493ebf863fc7c68249efc2fc3ef | |
| parent | d753e790727728d42c560c463d0d7a210de0b79c (diff) | |
| parent | 67fc34f804c522d32b5680e258201bc062e52d72 (diff) | |
| download | sqlite-c4622c1f2beffc5d4a5ea4da1989d84bc63cc22d.tar.gz | |
Merge "Make SQLite apex-available" into main am: 67fc34f804temp_319669529
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2968594
Change-Id: I0eafb87cfb795d7fa2d164df72117a6cd5b68c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/Android.bp | 11 | ||||
| -rw-r--r-- | dist/Android.bp | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/android/Android.bp b/android/Android.bp index c0a5c07..f0a6da6 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -44,8 +44,8 @@ cc_library_static { target: { android: { cflags: [ - "-DSQLITE_ENABLE_ICU", - "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE", + "-DSQLITE_ENABLE_ICU", + "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE", ], shared_libs: [ "libandroidicu", @@ -59,13 +59,18 @@ cc_library_static { ], }, windows: { - enabled: true, + enabled: true, }, vendor: { cflags: ["-USQLITE_ENABLE_ICU"], exclude_shared_libs: ["libandroidicu"], }, }, + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], + } // This static library is variant of libsqlite3_android built without the ICU diff --git a/dist/Android.bp b/dist/Android.bp index 8b67089..6ca2767 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -146,6 +146,10 @@ cc_library { }, }, export_include_dirs: ["."], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], afdo: true, } |