Android Patch: Include uconfig_local.h only when building with soong
This patch is intended to fix icu data build script tools/updateicudata.py
Test: ./tools/updateicudata.py
Test: ./tools/updatecldrdata.py
Bug: 117094880
Change-Id: I46b2a1b8b46b5a3578ac2b8c08b47f42fe95bb2f
diff --git a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h
index 9066a93..626c542 100644
--- a/icu4c/source/common/unicode/uconfig.h
+++ b/icu4c/source/common/unicode/uconfig.h
@@ -22,7 +22,15 @@
// internal APIs in Android's libandroidicu shim. For more information
// on this pre-processor variable see the comments below.
// Also, see http://b/117094880
+
+// To keep updateicudata.py, which uses the ICU make process, working
+// uconfig_local.h is only included when ANDROID is defined. When
+// ANDROID is defined, the code is being built by Android's platform
+// build system(s).
+#ifdef ANDROID
#define UCONFIG_USE_LOCAL 1
+#endif
+
/*!
* \file
* \brief User-configurable settings