зеркало из https://github.com/mozilla/gecko-dev.git
Bug 760740 - Use compatible-screens to control filtering of split Android builds [r=blassey]
This commit is contained in:
Родитель
ed787a036c
Коммит
72c82e29f6
|
@ -400,9 +400,6 @@ case "$target" in
|
|||
if test -z "$ANDROID_PACKAGE_NAME" ; then
|
||||
ANDROID_PACKAGE_NAME='org.mozilla.$(MOZ_APP_NAME)'
|
||||
fi
|
||||
if test -z "$MOZ_MOBILE_COMPAT" ; then
|
||||
MOZ_MOBILE_COMPAT='All'
|
||||
fi
|
||||
|
||||
AC_DEFINE(ANDROID)
|
||||
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
|
||||
|
@ -425,7 +422,6 @@ AC_SUBST(ANDROID_PLATFORM)
|
|||
AC_SUBST(ANDROID_SDK)
|
||||
AC_SUBST(ANDROID_PLATFORM_TOOLS)
|
||||
AC_SUBST(ANDROID_PACKAGE_NAME)
|
||||
AC_SUBST(MOZ_MOBILE_COMPAT)
|
||||
AC_SUBST(OBJCOPY)
|
||||
|
||||
dnl ========================================================
|
||||
|
|
|
@ -13,12 +13,13 @@
|
|||
<uses-sdk android:minSdkVersion="5"
|
||||
android:targetSdkVersion="11"/>
|
||||
|
||||
#ifdef MOZ_TABLETS_ONLY
|
||||
<supports-screens android:smallScreens="false"
|
||||
android:normalScreens="false"
|
||||
android:largeScreens="false"
|
||||
android:xlargeScreens="true" />
|
||||
#endif
|
||||
<compatible-screens>
|
||||
<!-- all xlarge size screens -->
|
||||
<screen android:screenSize="xlarge" android:screenDensity="ldpi" />
|
||||
<screen android:screenSize="xlarge" android:screenDensity="mdpi" />
|
||||
<screen android:screenSize="xlarge" android:screenDensity="hdpi" />
|
||||
<screen android:screenSize="xlarge" android:screenDensity="xhdpi" />
|
||||
</compatible-screens>
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
|
|
|
@ -63,11 +63,6 @@ DEFINES += \
|
|||
-DMOZILLA_OFFICIAL=$(MOZILLA_OFFICIAL) \
|
||||
$(NULL)
|
||||
|
||||
MOZ_MOBILE_COMPAT = @MOZ_MOBILE_COMPAT@
|
||||
ifeq (Tablets,$(MOZ_MOBILE_COMPAT))
|
||||
DEFINES += -DMOZ_TABLETS_ONLY=1
|
||||
endif
|
||||
|
||||
GARBAGE += \
|
||||
AndroidManifest.xml \
|
||||
classes.dex \
|
||||
|
|
|
@ -42,7 +42,25 @@
|
|||
|
||||
<!-- App requires OpenGL ES 2.0 -->
|
||||
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
||||
|
||||
|
||||
<compatible-screens>
|
||||
<!-- all small size screens -->
|
||||
<screen android:screenSize="small" android:screenDensity="ldpi" />
|
||||
<screen android:screenSize="small" android:screenDensity="mdpi" />
|
||||
<screen android:screenSize="small" android:screenDensity="hdpi" />
|
||||
<screen android:screenSize="small" android:screenDensity="xhdpi" />
|
||||
<!-- all normal size screens -->
|
||||
<screen android:screenSize="normal" android:screenDensity="ldpi" />
|
||||
<screen android:screenSize="normal" android:screenDensity="mdpi" />
|
||||
<screen android:screenSize="normal" android:screenDensity="hdpi" />
|
||||
<screen android:screenSize="normal" android:screenDensity="xhdpi" />
|
||||
<!-- all large size screens -->
|
||||
<screen android:screenSize="large" android:screenDensity="ldpi" />
|
||||
<screen android:screenSize="large" android:screenDensity="mdpi" />
|
||||
<screen android:screenSize="large" android:screenDensity="hdpi" />
|
||||
<screen android:screenSize="large" android:screenDensity="xhdpi" />
|
||||
</compatible-screens>
|
||||
|
||||
<application android:label="@MOZ_APP_DISPLAYNAME@"
|
||||
android:icon="@drawable/icon"
|
||||
android:name="org.mozilla.gecko.GeckoApplication"
|
||||
|
|
|
@ -16,7 +16,6 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
|||
|
||||
export JAVA_HOME=/tools/jdk6
|
||||
export MOZILLA_OFFICIAL=1
|
||||
export MOZ_MOBILE_COMPAT=Tablets
|
||||
|
||||
ac_add_options --enable-official-branding
|
||||
ac_add_options --with-branding=mobile/xul/branding/beta
|
||||
|
|
Загрузка…
Ссылка в новой задаче