Bug 1261438 - Normalize "TARGET_OS" to "android" in package-name.mk for android builds. r=nalexander draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 04 Apr 2016 11:50:45 -0700
changeset 347383 59dffe4cdbdf33ab1009ecc2c98752f8c52ee539
parent 347382 01b7245096397a1b98d5c61fb9522a2ddf952291
child 517619 e398a07a79add19a2ce9ce93a265694bf2457e0a
push id14570
push usercmanchester@mozilla.com
push dateMon, 04 Apr 2016 19:02:17 +0000
reviewersnalexander
bugs1261438
milestone48.0a1
Bug 1261438 - Normalize "TARGET_OS" to "android" in package-name.mk for android builds. r=nalexander MozReview-Commit-ID: 3jynklZkrbv
toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -13,16 +13,20 @@ PACKAGE_NAME_MK_INCLUDED := 1
 
 ifndef MOZ_PKG_VERSION
 MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
 endif
 
 ifndef MOZ_PKG_PLATFORM
 MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU)
 
+ifeq ($(MOZ_BUILD_APP),mobile/android)
+MOZ_PKG_PLATFORM := android-$(TARGET_CPU)
+endif
+
 # TARGET_OS/TARGET_CPU may be unintuitive, so we hardcode some special formats
 ifeq ($(OS_ARCH),WINNT)
 ifeq ($(TARGET_CPU),x86_64)
 MOZ_PKG_PLATFORM := win64
 else
 MOZ_PKG_PLATFORM := win32
 endif
 endif