Bug 1102488 - Pre: Remove unused cruft. r=rnewman
☠☠ backed out by f1f829b51b0a ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Thu, 20 Nov 2014 14:05:57 -0800
changeset 217270 5be12b2b704f4a86d639a10773167ccd1b1ee3e0
parent 217269 3c91378ef39b4fff3b78af18cbf753e51fdaf182
child 217271 e3a52be782f72f22e4ed8485600eb97bb508cd0b
push id10137
push usernalexander@mozilla.com
push dateTue, 25 Nov 2014 04:31:33 +0000
treeherderfx-team@f264f1d096a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs1102488
milestone36.0a1
Bug 1102488 - Pre: Remove unused cruft. r=rnewman I am thrilled that we no longer generate any Java files with "package @ANDROID_PACKAGE_NAME@;". Progress, a little at a time!
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -186,19 +186,16 @@ jni-stubs.inc: gecko-browser.jar gecko-m
 	$(PYTHON) $(topsrcdir)/mobile/android/base/jni-generator.py javah.out $@
 
 ANNOTATION_PROCESSOR_JAR_FILES := $(DEPTH)/build/annotationProcessors/annotationProcessors.jar
 
 GeneratedJNIWrappers.cpp: $(ANNOTATION_PROCESSOR_JAR_FILES)
 GeneratedJNIWrappers.cpp: $(ALL_JARS)
 	$(JAVA) -classpath gecko-mozglue.jar:$(JAVA_BOOTCLASSPATH):$(JAVA_CLASSPATH):$(ANNOTATION_PROCESSOR_JAR_FILES) org.mozilla.gecko.annotationProcessors.AnnotationProcessor $(ALL_JARS)
 
-# Like generated/org/mozilla/fennec_$USERID.
-android_package_dir = $(addprefix generated/,$(subst .,/,$(ANDROID_PACKAGE_NAME)))
-
 # These _PP_JAVAFILES are specified in moz.build and defined in
 # backend.mk, which is included by config.mk.  Therefore this needs to
 # be defined after config.mk is included.
 PP_JAVAFILES := $(filter-out generated/org/mozilla/gecko/R.java,$(gecko-mozglue_PP_JAVAFILES) $(gecko-browser_PP_JAVAFILES))
 
 manifest := \
   AndroidManifest.xml.in \
   WebappManifestFragment.xml.frag.in \
@@ -213,30 +210,16 @@ PP_TARGETS += manifest
 preprocessed := $(addsuffix .in,$(subst generated/org/mozilla/gecko/,,$(filter generated/org/mozilla/gecko/%,$(PP_JAVAFILES))))
 
 preprocessed_PATH := generated/org/mozilla/gecko
 preprocessed_KEEP_PATH := 1
 preprocessed_FLAGS := --marker='//\\\#'
 
 PP_TARGETS += preprocessed
 
-# Certain source files have Java package name @ANDROID_PACKAGE_NAME@.
-# We hate these files but they are necessary for backwards
-# compatibility.  These special rules generate these files into
-# generated/org/mozilla/{firefox,firefox_beta,fennec,fennec_$USER} for
-# consumption by the build system and IDEs.
-
-preprocessed_package := $(addsuffix .in,$(subst $(android_package_dir)/,,$(filter $(android_package_dir)/%,$(PP_JAVAFILES))))
-
-preprocessed_package_PATH := $(android_package_dir)
-preprocessed_package_KEEP_PATH := 1
-preprocessed_package_FLAGS := --marker='//\\\#'
-
-PP_TARGETS += preprocessed_package
-
 include $(topsrcdir)/config/rules.mk
 
 not_android_res_files := \
   *.mkdir.done* \
   *.DS_Store* \
   *\#* \
   *.rej \
   *.orig \