bug 930062 - GeckoView library should support building as an ant project r=nalexander
authorBrad Lassey <blassey@mozilla.com>
Thu, 24 Oct 2013 01:08:29 +0200
changeset 154062 9bb77ef52ef8e868f85b12da2b71fe719966ff96
parent 154061 ffc304df398d4aeb3f167645fe14dfa2d9065cda
child 154063 e702cd7761e54589d63d2e146b364049b3fd3101
push id25620
push userkwierso@gmail.com
push dateFri, 08 Nov 2013 01:33:41 +0000
treeherdermozilla-central@70f21fad60a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs930062
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 930062 - GeckoView library should support building as an ant project r=nalexander
mobile/android/geckoview_library/AndroidManifest.xml
mobile/android/geckoview_library/Makefile.in
mobile/android/geckoview_library/build.xml
mobile/android/geckoview_library/local.properties.in
--- a/mobile/android/geckoview_library/AndroidManifest.xml
+++ b/mobile/android/geckoview_library/AndroidManifest.xml
@@ -1,17 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.mozilla.geckoview"
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="17" />
 
 </manifest>
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -4,21 +4,42 @@
 
 INSTALL_TARGETS += GECKOVIEW_LIBRARY
 GECKOVIEW_LIBRARY_DEST = $(CURDIR)
 GECKOVIEW_LIBRARY_FILES := \
   .classpath \
   .project \
   AndroidManifest.xml \
   project.properties \
+  build.xml \
   $(NULL)
 
+
+PP_TARGETS = properties
+
+properties = local.properties.in
+properties_PATH = .
+properties_deps := $(patsubst %.in,%,$(properties))
+
+GARBAGE = $(GECKOVIEW_LIBRARY_FILES) $(properties_deps)
+
+GARBAGE_DIRS = \
+  bin \
+  libs \
+  src \
+  .deps \
+  gen  \
+  res \
+  $(NULL)
+
+DEFINES += -DANDROID_SDK=$(ANDROID_SDK)
+
 include $(topsrcdir)/config/rules.mk
 
-package:
+package: $(properties_deps)
 	# Make directory for the zips
 	$(MKDIR) -p $(DIST)/geckoview_library
 
 	# Zip the assets
 	cd $(DIST)/fennec; \
 	$(ZIP) -r ../geckoview_library/geckoview_assets.zip assets
 
 	# Make empty directories to fit an Android project structure
new file mode 100644
--- /dev/null
+++ b/mobile/android/geckoview_library/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="GeckoView" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <!--<property file="ant.properties" />-->
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
new file mode 100644
--- /dev/null
+++ b/mobile/android/geckoview_library/local.properties.in
@@ -0,0 +1,11 @@
+#filter substitution
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=@ANDROID_SDK@/../../