diff options
| author | Alex Deymo <deymo@google.com> | 2016-01-22 18:46:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 18:46:55 +0000 |
| commit | 746bfb6d43a8e9eb4a8c4a5df8aeff2d8db3fa5a (patch) | |
| tree | 79b219dda299ba1b426f745f4e3c1610a8b01ad0 | |
| parent | 51ebf91ce04d2def5d07e3d2716153c9fe6eb423 (diff) | |
| parent | 340b8dd38ca56de409ca4f790b45b1c314c544dd (diff) | |
| download | libchrome-746bfb6d43a8e9eb4a8c4a5df8aeff2d8db3fa5a.tar.gz | |
Set default USE flags values as local variables.
am: 340b8dd38c
* commit '340b8dd38ca56de409ca4f790b45b1c314c544dd':
Set default USE flags values as local variables.
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index 93b2cfd867..a7b7e60507 100644 --- a/Android.mk +++ b/Android.mk @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Default values for the USE flags. Set these variables in your product .mk -# file. -BRILLO_USE_DBUS ?= 1 +# Default values for the USE flags. Override these USE flags from your product +# by setting BRILLO_USE_* values. Note that we define local variables like +# local_use_* to prevent leaking our default setting for other packages. +local_use_dbus := $(if $(BRILLO_USE_DBUS),$(BRILLO_USE_DBUS),1) LOCAL_PATH := $(call my-dir) @@ -424,7 +425,7 @@ LOCAL_SRC_FILES := $(libchromeCommonSrc) $(libchromeHostSrc) LOCAL_LDFLAGS := $(libchromeHostLdFlags) include $(BUILD_HOST_SHARED_LIBRARY) -ifeq ($(BRILLO_USE_DBUS),1) +ifeq ($(local_use_dbus),1) # libchrome-dbus shared library for target # ======================================================== @@ -459,7 +460,7 @@ LOCAL_STATIC_LIBRARIES := LOCAL_EXPORT_C_INCLUDE_DIRS := $(libchromeExportedCIncludes) include $(BUILD_SHARED_LIBRARY) -endif # BRILLO_USE_DBUS == 1 +endif # local_use_dbus == 1 # Helpers needed for unit tests. # ======================================================== @@ -480,7 +481,7 @@ LOCAL_SRC_FILES := \ include $(BUILD_STATIC_LIBRARY) -ifeq ($(BRILLO_USE_DBUS),1) +ifeq ($(local_use_dbus),1) # Helpers needed for D-Bus unit tests. # ======================================================== @@ -499,7 +500,7 @@ LOCAL_SRC_FILES := \ include $(BUILD_STATIC_LIBRARY) -endif # BRILLO_USE_DBUS == 1 +endif # local_use_dbus == 1 # Helpers needed for unit tests (for host). # ======================================================== |