summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Coles <torne@google.com>2015-04-20 11:54:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-20 11:54:19 +0000
commitc888ae53f5ebe2e8223872d1942e9368b4df3302 (patch)
treec44005416fa7fd999e31761ee0c57bf90ba8ff30
parent0d437a930ccfe86febed693ed4e3e2103bcbddc9 (diff)
parent1ec638c7699b111a9d6ce81ef874c5f0463b655b (diff)
downloadchromium_org-master-soong.tar.gz
Merge "Fix build with prebuilt webview"master-soong
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 6249a1c1b3..7eb587cf37 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,6 @@ GYP_CONFIGURATION := Release
ifeq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes)
GYP_MAKEFILE_STEMS := \
$(addprefix $(CHROMIUM_DIR)/v8/tools/gyp/, \
- generate_trig_table.host \
js2c.host \
mksnapshot.host \
v8_base.host \
@@ -34,7 +33,6 @@ GYP_MAKEFILE_STEMS := \
icuuc.host \
icui18n.target \
icuuc.target \
- system_icu.target \
)
else
# Not using a prebuilt; include the manually-written makefile that builds all