Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Makefile

Issue 1196253002: [android] Merge gyp configurations. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Landmine Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Makefile.android » ('j') | build/standalone.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile
diff --git a/Makefile b/Makefile
index 6f3c80b71e67de435605a3adbb02c26c159ed96d..3f6cde8961e11c2fcdfc7a42cc3a05e1e33f4723 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64
GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
build/shim_headers.gypi build/features.gypi build/standalone.gypi \
build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
- build/android.gypi test/cctest/cctest.gyp \
+ test/cctest/cctest.gyp \
test/unittests/unittests.gyp tools/gyp/v8.gyp \
tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
buildtools/third_party/libc++abi/libc++abi.gyp \
@@ -315,7 +315,7 @@ native: $(OUTDIR)/Makefile.native
$(ANDROID_ARCHES): $(addprefix $$@.,$(MODES))
-$(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \
+$(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) \
must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android
@$(MAKE) -f Makefile.android $@ \
ARCH="$(basename $@)" \
« no previous file with comments | « no previous file | Makefile.android » ('j') | build/standalone.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698