mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
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! --HG-- extra : rebase_source : f5211b309488adbab3ad47e63f1a3920093a85d8 extra : source : fa85f8d8b182fad743556a012a982daad121f0b1
This commit is contained in:
parent
4d3964dda8
commit
ad9821f977
@ -191,9 +191,6 @@ 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.
|
||||
@ -218,20 +215,6 @@ 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 := \
|
||||
|
Loading…
Reference in New Issue
Block a user