aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Cianciulli <scianciulli@google.com>2022-05-18 17:01:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-18 17:01:36 +0000
commit532bccdf7eb184621e9c411bd862caa31d2aa366 (patch)
treed41165f73fbd94e19e831dccb9f1eaeb82754973
parent539af56a564cb644fea362a988448780114c5cdf (diff)
parent5289dbbbd0c3a4feb34afb57e15e3a0c636ec7f8 (diff)
downloadtinyxml2-532bccdf7eb184621e9c411bd862caa31d2aa366.tar.gz
Merge "Enable libtinyxml2 on Windows" am: 2a8d316f9a am: 323168c9be am: 45df6677d5 am: 5e3eedcb48 am: 5289dbbbd0
Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/2095249 Change-Id: Ic14ab987f0058dae8958b69ac22d61505be0b926 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 21e5861..fceabd9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,6 +63,12 @@ cc_library {
"-DANDROID_NDK",
],
},
+ windows: {
+ enabled: true,
+ shared: {
+ enabled: false,
+ }
+ },
},
export_include_dirs: ["."],