Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 10:27:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 714874 - Split Fennec and Sync java files to allow different compile flags. r=rnewman r=dougt a=dougt

Browse Source
This commit is contained in:
Chris Peterson 2012-01-05 15:02:41 -08:00
parent 530f96e164
commit ac5bcdcf66
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mobile/android/base/Makefile.in
View File

@ -50,14 +50,14 @@ DIST_FILES = package-name.txt
SYNC_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/java-sources.mn | tr '\n' ' ';)
SYNC_PP_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/preprocess-sources.mn | tr '\n' ' ';)
SYNC_THIRDPARTY_JAVA_FILES=$(shell cat $(topsrcdir)/mobile/android/sync/java-third-party-sources.mn | tr '\n' ' ';)
SYNC_RES_DRAWABLE=$(shell cat $(topsrcdir)/mobile/android/sync/android-drawable-resources.mn | tr '\n' ' ';)
SYNC_RES_LAYOUT=$(shell cat $(topsrcdir)/mobile/android/sync/android-layout-resources.mn | tr '\n' ' ';)
SYNC_RES_VALUES=$(shell cat $(topsrcdir)/mobile/android/sync/android-values-resources.mn | tr '\n' ' ';)
SYNC_RES_XML=res/xml/sync_authenticator.xml
SYNC_PP_RES_XML=res/xml/sync_syncadapter.xml
JAVAFILES = \
$(SYNC_JAVA_FILES) \
FENNEC_JAVA_FILES = \
AboutHomeContent.java \
AlertNotification.java \
AutoCompletePopup.java \
@ -124,8 +124,7 @@ JAVAFILES = \
ui/PanZoomController.java \
$(NULL)
PROCESSEDJAVAFILES = \
$(SYNC_PP_JAVA_FILES) \
FENNEC_PP_JAVA_FILES = \
App.java \
LauncherShortcuts.java \
NotificationHandler.java \
@ -160,7 +159,8 @@ DEFINES += \
GARBAGE += \
AndroidManifest.xml \
classes.dex \
$(PROCESSEDJAVAFILES) \
$(FENNEC_PP_JAVA_FILES) \
$(SYNC_PP_JAVA_FILES) \
gecko.ap_ \
res/values/strings.xml \
R.java \
@ -468,7 +468,7 @@ RES_MENU = \
JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
ifdef MOZ_CRASHREPORTER
PROCESSEDJAVAFILES += CrashReporter.java
FENNEC_PP_JAVA_FILES += CrashReporter.java
MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/crash_reporter.png
RES_LAYOUT += res/layout/crash_reporter.xml
endif
@ -559,9 +559,10 @@ include $(topsrcdir)/config/android-common.mk
# Sync dependencies are provided in a single jar. Sync classes themselves are delivered as source,
# because Android resource classes must be compiled together in order to avoid overlapping resource
# indices.
classes.dex: $(JAVAFILES) $(PROCESSEDJAVAFILES) R.java
classes.dex: $(FENNEC_JAVA_FILES) $(FENNEC_PP_JAVA_FILES) $(SYNC_JAVA_FILES) $(SYNC_PP_JAVA_FILES) $(SYNC_THIRDPARTY_JAVA_FILES) R.java
$(NSINSTALL) -D classes
$(JAVAC) $(JAVAC_FLAGS) -Xlint:unchecked -Xlint:deprecation -d classes $(addprefix $(srcdir)/,$(JAVAFILES)) $(PROCESSEDJAVAFILES) R.java
$(JAVAC) $(JAVAC_FLAGS) -Xlint:unchecked -Xlint:deprecation -d classes $(addprefix $(srcdir)/,$(SYNC_THIRDPARTY_JAVA_FILES))
$(JAVAC) $(JAVAC_FLAGS) -Xlint:unchecked -Xlint:deprecation -d classes -classpath classes $(addprefix $(srcdir)/,$(FENNEC_JAVA_FILES)) $(FENNEC_PP_JAVA_FILES) $(addprefix $(srcdir)/,$(SYNC_JAVA_FILES)) $(SYNC_PP_JAVA_FILES) R.java
$(DX) --dex --output=$@ classes
PP_RES_XML=$(SYNC_PP_RES_XML)
@ -570,7 +571,7 @@ $(PP_RES_XML): $(subst res/,$(srcdir)/resources/, $(PP_RES_XML).in)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
AndroidManifest.xml $(PROCESSEDJAVAFILES) package-name.txt: % : %.in
AndroidManifest.xml $(FENNEC_PP_JAVA_FILES) $(SYNC_PP_JAVA_FILES) package-name.txt: % : %.in
mkdir -p db sync/repositories/android
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@

1
mobile/android/sync/java-sources.mn
View File

File diff suppressed because one or more lines are too long

1
mobile/android/sync/java-third-party-sources.mn Normal file
View File

File diff suppressed because one or more lines are too long