Backed out changeset 5be12b2b704f (bug 1102488)

This commit is contained in:
Carsten "Tomcat" Book 2014-11-25 08:42:58 +01:00
parent e6b8e2e9a1
commit d3352efd24

View File

@ -191,6 +191,9 @@ 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.
@ -215,6 +218,20 @@ 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 := \