wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 924232 - Part 1: Remove special processing of FENNEC_PP_JAVA_VIEW_FILES. r=mfinkle

Browse Source
This commit is contained in:
Nick Alexander 2013-10-10 11:53:12 -07:00
parent 4e82c7b68d
commit f261e39580
10 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/GeckoButton.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE Button
#include GeckoView.java.frag

3
mobile/android/base/GeckoEditText.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE EditText
#include GeckoView.java.frag

3
mobile/android/base/GeckoFrameLayout.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE FrameLayout
#include GeckoView.java.frag

3
mobile/android/base/GeckoImageButton.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE ImageButton
#include GeckoView.java.frag

3
mobile/android/base/GeckoImageView.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE ImageView
#include GeckoView.java.frag

3
mobile/android/base/GeckoLinearLayout.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE LinearLayout
#include GeckoView.java.frag

3
mobile/android/base/GeckoRelativeLayout.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE RelativeLayout
#include GeckoView.java.frag

3
mobile/android/base/GeckoTextSwitcher.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE TextSwitcher
#include GeckoView.java.frag

3
mobile/android/base/GeckoTextView.java.in Normal file
View File

@ -0,0 +1,3 @@
#filter substitution
#define VIEWTYPE TextView
#include GeckoView.java.frag

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

@ -298,21 +298,18 @@ ifdef MOZ_ANDROID_ANR_REPORTER
DEFINES += -DMOZ_ANDROID_ANR_REPORTER=1
endif
FENNEC_PP_JAVA_VIEW_FILES = \
FENNEC_PP_JAVA_FILES := \
App.java \
AppConstants.java \
GeckoButton.java \
GeckoImageButton.java \
GeckoImageView.java \
GeckoEditText.java \
GeckoFrameLayout.java \
GeckoImageButton.java \
GeckoImageView.java \
GeckoLinearLayout.java \
GeckoRelativeLayout.java \
GeckoTextSwitcher.java \
GeckoTextView.java \
$(NULL)
FENNEC_PP_JAVA_FILES = \
App.java \
AppConstants.java \
SysInfo.java \
WebApp.java \
WebApps.java \
@ -395,7 +392,6 @@ GARBAGE += \
classes.dex \
$(MOZGLUE_PP_JAVA_FILES) \
$(FENNEC_PP_JAVA_FILES) \
$(FENNEC_PP_JAVA_VIEW_FILES) \
$(SYNC_PP_JAVA_FILES) \
gecko.ap_ \
res/values/strings.xml \
@ -1245,7 +1241,6 @@ gecko-browser_JAVAFILES := \
$(NULL)
gecko-browser_PP_JAVAFILES := \
$(FENNEC_PP_JAVA_FILES) \
$(FENNEC_PP_JAVA_VIEW_FILES) \
$(SYNC_PP_JAVA_FILES) \
R.java \
$(NULL)
@ -1271,7 +1266,6 @@ JAVA_JAR_TARGETS += gecko-util
gecko-util_DEST := jars/gecko-util.jar
gecko-util_JAVAFILES := \
$(UTIL_JAVA_FILES) \
$(UTIL_PP_JAVA_FILES) \
$(NULL)
gecko-util_EXTRA_JARS := \
jars/gecko-mozglue.jar \
@ -1374,11 +1368,6 @@ $(android-tgts): % : %.in $(android-preqs)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
# Replace @VIEWTYPE@ with different View names.
$(FENNEC_PP_JAVA_VIEW_FILES): GeckoView.java.frag
@rm -f $@
cat $< | sed s,@VIEWTYPE@,$(patsubst Gecko%.java,%,$@),g >> $@ ; \
res/drawable-mdpi/icon.png: $(ICON_PATH)
$(NSINSTALL) -D res/drawable-mdpi
cp $(ICON_PATH) $@