diff options
| author | Torne (Richard Coles) <torne@google.com> | 2012-11-14 11:43:16 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2012-11-14 11:43:16 +0000 |
| commit | 5821806d5e7f356e8fa4b058a389a808ea183019 (patch) | |
| tree | e19f4793aac92e2c0d9a01087019a60d6657d838 /Android.mk | |
| parent | 8e79a8efe247f109aafd917a69e8a392961b3687 (diff) | |
| download | chromium_org-5821806d5e7f356e8fa4b058a389a808ea183019.tar.gz | |
Merge from Chromium at DEPS revision r167172
This commit was generated by merge_to_master.py.
Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000000..6cf1fd55e3 --- /dev/null +++ b/Android.mk @@ -0,0 +1,18 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This Android makefile is used to build WebView in the Android build system. +# gyp autogenerates most of the real makefiles, which we just include here if +# we are doing a WebView build. For other builds, this makefile does nothing, +# which prevents the Android build system from mistakenly loading any other +# Android.mk that may exist in the Chromium tree. + +CHROMIUM_DIR := $(call my-dir) + +# Assume that if the gyp autogenerated makefile exists, we are doing the +# WebView build using the Android build system. +ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.mk)) +include $(CHROMIUM_DIR)/GypAndroid.mk +include $(CHROMIUM_DIR)/android_webview/Android.mk +endif |