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

Unified Diff: android_webview/Android.mk

Issue 12939021: Make the build control what library(/ies) to load (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@antpy
Patch Set: Created 7 years, 9 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 | android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/Android.mk
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 106081a300634b2489a16836aaadaa5b1d8fdc20..4b707fb5e115685909aa2f52bd4d2dc403784d4c 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -42,6 +42,11 @@ LOCAL_SRC_FILES += \
$(call all-java-files-under, \
../components/navigation_interception/android/java/src) \
+# This directory includes .java files that are generated by the normal gyp build, but are checked in
+# for the Android build.
+# TODO(torne, cjhopman): Consider removing this.
+LOCAL_SRC_FILES += \
+ $(call all-java-files-under, java/generated_src)
# Java files generated from .template rules. This list should match list of java dependencies in
# android_webview/all_webview.gyp
« no previous file with comments | « no previous file | android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698