commit 78a954ffae03c486324331a016160c8d9b6481d0
author Alex Deymo <deymo@google.com> Thu Jan 21 20:32:40 2016 -0800
committer Alex Deymo <deymo@google.com> Thu Jan 21 20:53:38 2016 -0800
tree 136e7775b36bc94861a9b580a2b55e3cc5719b4c
parent a93cd53c4f8ab8cb926ed9223373567ebbf45cb6

Set default USE flags values as local variables.

Setting variables such as BRILLO_USE_FOO can leak to other makefiles,
so the local default value set by another project can affect the
default behavior. This patch defines local variables with the local
default value for the USE flags.

Also, minor fix to the default value for "binder" in the Chromium OS
side.

Bug: None
TEST=mmma system/update_engine

Change-Id: I47e1300efa1d93ed91c78bef41481a327753483c

update_engine.gyp

diff --git a/update_engine.gyp b/update_engine.gyp
index a44bdee..02728be 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -23,6 +23,7 @@
       # The -DUSE_* flags are passed from platform2.py. We use sane defaults
       # here when these USE flags are not defined. You can set the default value
       # for the USE flag in the ebuild.
+      'USE_binder%': '0',
       'USE_dbus%': '1',
       'USE_hwid_override%': '0',
       'USE_mtd%': '0',
@@ -47,7 +48,7 @@
     'defines': [
       '_FILE_OFFSET_BITS=64',
       '_POSIX_C_SOURCE=199309L',
-      'USE_BINDER=0',
+      'USE_BINDER=<(USE_binder)',
       'USE_DBUS=<(USE_dbus)',
       'USE_HWID_OVERRIDE=<(USE_hwid_override)',
       'USE_MTD=<(USE_mtd)',