diff options
| -rw-r--r-- | brunch/lib/bsp/manifest.json | 18 | ||||
| -rw-r--r-- | brunch/lib/commands/product/build.py | 2 | ||||
| -rw-r--r-- | brunch/lib/commands/product/create.py | 2 | ||||
| -rw-r--r-- | brunch/lib/metrics/send_hits.py | 10 | ||||
| -rw-r--r-- | build/wrap-common.mk | 8 |
5 files changed, 25 insertions, 15 deletions
diff --git a/brunch/lib/bsp/manifest.json b/brunch/lib/bsp/manifest.json index 8fca239..9f73f50 100644 --- a/brunch/lib/bsp/manifest.json +++ b/brunch/lib/bsp/manifest.json @@ -28,28 +28,28 @@ "package_type" : "tar", "name" : "Dragonboard device code", "path" : "device/qcom/dragonboard", - "subdir" : "android/device/qcom/dragonboard", - "remote" : "https://dl.google.com/brillo/bsp/dragonboard/7.1.0/dragonboard_google_bsp_7.1.0.tar.gz", + "subdir" : "bdk/device/qcom/dragonboard", + "remote" : "https://dl.google.com/brillo/bsp/dragonboard/1/dragonboard_google_bsp_1.tar.gz", "licenses" : [], - "version" : "343f06c658a309b847790cb6927d8ef43de3b3951befc3cca4b36802c683c910" + "version" : "adc5f3ff60cabf2b46c65a139b3fdcf9dd297128c2282386ecef8f7d24946ede" }, { "package_type" : "tar", "name" : "Dragonboard base hardware code", "path" : "hardware/bsp/qcom", - "subdir" : "android/hardware/bsp/qcom", - "remote" : "https://dl.google.com/brillo/bsp/dragonboard/7.1.0/dragonboard_google_bsp_7.1.0.tar.gz", + "subdir" : "bdk/hardware/bsp/qcom", + "remote" : "https://dl.google.com/brillo/bsp/dragonboard/1/dragonboard_google_bsp_1.tar.gz", "licenses" : [], - "version" : "343f06c658a309b847790cb6927d8ef43de3b3951befc3cca4b36802c683c910" + "version" : "adc5f3ff60cabf2b46c65a139b3fdcf9dd297128c2282386ecef8f7d24946ede" }, { "package_type" : "tar", "name" : "Dragonboard hardware kernel code", "path" : "hardware/bsp/kernel/qcom", - "subdir" : "android/hardware/bsp/kernel/qcom", - "remote" : "https://dl.google.com/brillo/bsp/dragonboard/7.1.0/dragonboard_google_bsp_7.1.0.tar.gz", + "subdir" : "bdk/hardware/bsp/kernel/qcom", + "remote" : "https://dl.google.com/brillo/bsp/dragonboard/1/dragonboard_google_bsp_1.tar.gz", "licenses" : [], - "version" : "343f06c658a309b847790cb6927d8ef43de3b3951befc3cca4b36802c683c910" + "version" : "adc5f3ff60cabf2b46c65a139b3fdcf9dd297128c2282386ecef8f7d24946ede" } ] }, diff --git a/brunch/lib/commands/product/build.py b/brunch/lib/commands/product/build.py index 49016ed..aa9d236 100644 --- a/brunch/lib/commands/product/build.py +++ b/brunch/lib/commands/product/build.py @@ -62,7 +62,7 @@ class Build(clicommand.Command): args.make_args.count('--') and args.make_args.remove('--') # If user options haven't been set up yet, do so. - # TODO(arihc): move this to install script instead of here. + # TODO(arihc)(b/24381926): move this to install script instead of here. user_store = config.UserStore() if not user_store.complete(): user_store.initialize() diff --git a/brunch/lib/commands/product/create.py b/brunch/lib/commands/product/create.py index b7bc694..052bfe6 100644 --- a/brunch/lib/commands/product/create.py +++ b/brunch/lib/commands/product/create.py @@ -29,7 +29,7 @@ class Create(clicommand.Command): @staticmethod def Args(parser): parser.add_argument('name', help='Product name') - # TODO(wad, arihc) populate BSP choices here if possible. + # TODO(wad, arihc)(b/25670466) populate BSP choices here if possible. parser.add_argument('device', help='Device name (BSP)') parser.add_argument('-v', '--vendor', default='novendor', help='Product vendor name') diff --git a/brunch/lib/metrics/send_hits.py b/brunch/lib/metrics/send_hits.py index 3a8f9e5..7a18fd3 100644 --- a/brunch/lib/metrics/send_hits.py +++ b/brunch/lib/metrics/send_hits.py @@ -44,15 +44,19 @@ def SendHit(hit_obj): """ return SendHitFields(hit_obj.GetFields()) + def SendHitFields(hit_fields): """Sends a hit, saving if it fails. Args: hit_fields: A dictionary of { key : val } describing the hit. """ - result = hit.Hit.SendFields(hit_fields) - if not result: - hit_store.Backup().Save(hit_fields) + result = False + try: + result = hit.Hit.SendFields(hit_fields) + finally: + if not result: + hit_store.Backup().Save(hit_fields) return result diff --git a/build/wrap-common.mk b/build/wrap-common.mk index db9c614..5871ab6 100644 --- a/build/wrap-common.mk +++ b/build/wrap-common.mk @@ -29,6 +29,10 @@ endif # Quiet prefix Q ?= @ +# Must not be passed in implicitly from the environment. +ifeq "$(origin Q)" "environment" +Q := @ +endif # Create a symlink farm from the BDK tree. # @@ -111,10 +115,11 @@ endef # TODO(wad) Make tee optional define build-product $(Q)(cd "$(2)" && \ + unset MAKEFLAGS MAKEOVERRIDES MAKECMDGOALS MAKELEVEL && \ . build/envsetup.sh && \ add_lunch_combo "$(3)-$(6)" && \ lunch "$(3)-$(6)" && \ - PATH=$(2)/java/bin:$$PATH $(MAKE) $(MAKECMDGOALS) "OUT_DIR=$(5)/out-$(4)" KATI_EMULATE_FIND=false || \ + MAKEFLAGS="$(MAKEFLAGS)" PATH=$(2)/java/bin:$$PATH $(MAKE) $(MAKECMDGOALS) "OUT_DIR=$(5)/out-$(4)" KATI_EMULATE_FIND=false || \ exit $?) 2>&1 | tee "$(5)/last_build.log" endef @@ -126,6 +131,7 @@ endef define build-product-here $(Q)echo "Building in subtree $(7) . . ." $(Q)(cd "$(2)" && \ + unset MAKEFLAGS MAKEOVERRIDES MAKECMDGOALS MAKELEVEL && \ . build/envsetup.sh && \ add_lunch_combo "$(3)-$(6)" && \ lunch "$(3)-$(6)" && \ |