summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Android: Support a prebuilt WebView.torne@chromium.org2013-11-131-0/+4
| | | | | | | | | | | | | When building using the Android platform build system, if the current product sets PRODUCT_PREBUILT_WEBVIEWCHROMIUM, do not attempt to build the WebView from source. BUG= NOTRY=true Review URL: https://codereview.chromium.org/66343006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234848 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: don't switch debug/release automatically.torne@chromium.org2013-07-171-4/+2
| | | | | | | | | | | | | | Changing build config based on TARGET_BUILD_VARIANT breaks the buildbots downstream; just default it to Release all the time. Developers can manually specify GYP_CONFIGURATION=Debug at make time. NOTRY=true BUG= R=benm@chromium.org Review URL: https://codereview.chromium.org/19463006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212014 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: build debug/release based on variant.torne@chromium.org2013-06-251-0/+8
| | | | | | | | | | | | When building for user or userdebug, build Chromium in Release mode. When building for eng, build Chromium in Debug mode. BUG= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/17709002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208527 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: makefiles are host_os-specific.torne@chromium.org2012-11-211-2/+2
| | | | | | | | | | | | The generated makefiles are specific to the host OS they were generated for. For now, just name them appropriately so that mac hosts don't try to include linux-specific makefiles. BUG= Review URL: https://codereview.chromium.org/11416127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169025 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: allow for multiple target architectures.torne@chromium.org2012-11-191-2/+2
| | | | | | | | | | | | | | | | | | | The WebView will eventually need to be built for multiple target architectures. Prepare for this by passing --suffix .arm to gyp when generating the makefiles, and including an architecture-specific makefile at the top level. Also, remove the hardcoding of arm as the target architecture in envsetup.sh. The previous change I made to .gitignore to only ignore *.host.mk and *.target.mk instead of *.mk has been reverted in favour of just specifically un-ignoring files called Android.mk (which are handwritten). BUG= Review URL: https://codereview.chromium.org/11416036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168506 0039d316-1c4b-4281-b951-d872f2087c98
* Android: make the top level Android makefile smarter.torne@chromium.org2012-10-261-4/+7
| | | | | | | | | | | | | | | | | | Instead of requiring an environment variable to be set, which has resulted in issues with things not being rebuilt correctly when the variable is forgotten, check to see if the gyp-generated Android makefile has been created, and if so assume we are doing a WebView build. This file only exists if gyp has been run with GYP_GENERATORS=android which only happens in the WebView tree. Also, rename CHROMIUM_WEBVIEW_DIR to CHROMIUM_DIR as the directory itself is not webview-specific; it's just the Chromium tree root. BUG= Review URL: https://codereview.chromium.org/11269007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164291 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: fix build issues and nits.torne@chromium.org2012-10-181-2/+3
| | | | | | | | | | | | | | | | | 1) The top-level Android.mk mustn't use my-dir after including another file as it returns the wrong answer. 2) We need "All" to depend on net_errors_java as it's used by the Android.mk. 3) Fix nits from previous review of android_webview/Android.mk - make it clearer that only one of the dependencies is temporary. BUG= Review URL: https://codereview.chromium.org/11187052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162716 0039d316-1c4b-4281-b951-d872f2087c98
* Android WebView: create a java module.torne@chromium.org2012-10-171-3/+4
| | | | | | | | | | | | | | The WebView needs a bunch of Java code from the Chromium tree (contentview and its dependencies) in order to build. Introduce an Android build system makefile into android_webview which builds a suitable static java library. R=benm@chromium.org BUG= Review URL: https://codereview.chromium.org/11185025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162404 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Make webview builds more convenient.torne@chromium.org2012-10-121-2/+9
| | | | | | | | | | | | | Allow the top level Android.mk to include GypAndroid.mk if the relevant environment variable is set, to avoid having to edit this file to build in the Android tree without breaking other Android builds. Also, provide a gyp wrapper for webview which passes the correct options. BUG= Review URL: https://codereview.chromium.org/11090069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161566 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes to allow building in an Android treesteveblock@chromium.org2012-06-251-0/+6
- Add empty Android.mk to prevent the Android build system from erroneously picking up other Android.mk files. - Rename content_shell_content_view to libcontent_shell_content_view as Android build system requires that shared library target names start with 'lib'. Review URL: https://chromiumcodereview.appspot.com/10637006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143925 0039d316-1c4b-4281-b951-d872f2087c98