Bug 1193270 - Use lower-case variables for local variables in geckoview_library's Makefile.in; r=nalexander
authorMs2ger <ms2ger@gmail.com>
Thu, 10 Sep 2015 13:49:19 +0200
changeset 294364 5225d690ccaafc3f0f411d5cf49c260fae8236dc
parent 294363 47dc98dd7dbf07d231c805def31a6fb94002f21d
child 294365 c61235986f912b7274bc511680b3262b053a47bc
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1193270
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1193270 - Use lower-case variables for local variables in geckoview_library's Makefile.in; r=nalexander This makes it easier to distinguish this local variable from standardized variables.
mobile/android/geckoview_library/Makefile.in
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -24,39 +24,39 @@ GARBAGE_DIRS = \
   src \
   .deps \
   gen  \
   res \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-_ABS_DIST = $(abspath $(DIST))
+abs_dist = $(abspath $(DIST))
 
-DIST_FILES = $(addprefix $(_ABS_DIST)/bin/, libmozglue.so $(MOZ_CHILD_PROCESS_NAME) $(MOZ_CHILD_PROCESS_NAME_PIE))
+dist_files = $(addprefix $(abs_dist)/bin/, libmozglue.so $(MOZ_CHILD_PROCESS_NAME) $(MOZ_CHILD_PROCESS_NAME_PIE))
 
 package: local.properties project.properties AndroidManifest.xml FORCE
 	# Make directory for the zips
-	$(MKDIR) -p $(_ABS_DIST)/geckoview_library
+	$(MKDIR) -p $(abs_dist)/geckoview_library
 
 	# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
-	$(call py_action,zip,-C $(_ABS_DIST)/$(MOZ_APP_NAME) $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets)
+	$(call py_action,zip,-C $(abs_dist)/$(MOZ_APP_NAME) $(abs_dist)/geckoview_library/geckoview_assets.zip assets)
 
 	# Make empty directories to fit an Android project structure
 	$(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src
 
 	# Copy the JARs, except for the jar containing org.mozilla.gecko.R.
 	# org.mozilla.gecko.R will be provided by the embedding application.
 	cp $(DEPTH)/mobile/android/base/*.jar libs/
 	$(RM) libs/gecko-R.jar
 
 	# Copy the SOs.
-	cp $(DIST_FILES) libs/$(ANDROID_CPU_ARCH)/
+	cp $(dist_files) libs/$(ANDROID_CPU_ARCH)/
 
 	# Copy the resources
 	$(RM) -rf res
 	$(MKDIR) -p res
 	cd res && \
-	$(UNZIP) -q -u -o $(_ABS_DIST)/bin/geckoview_resources.zip
+	$(UNZIP) -q -u -o $(abs_dist)/bin/geckoview_resources.zip
 
 	# Zip the directory
 	cd $(DEPTH)/mobile/android && \
-	$(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_library.zip geckoview_library -x geckoview_library/backend.mk geckoview_library/Makefile
+	$(ZIP) -q -r $(abs_dist)/geckoview_library/geckoview_library.zip geckoview_library -x geckoview_library/backend.mk geckoview_library/Makefile