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

Unified Diff: chrome/android/chrome_apk.gyp

Issue 1948503002: 🌞 Upstream targets for building native libraries for chrome/monochrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixdeps Created 4 years, 7 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 | « chrome/android/BUILD.gn ('k') | chrome/browser/android/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_apk.gyp
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index 6b8929cdca4856687de85a51d9f0f9e0b9b06094..226724022eee19f6051473c84db20f724f9d0e6d 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -16,13 +16,19 @@
'chrome_sync_shell_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_apk_manifest/AndroidManifest.xml',
'chrome_sync_shell_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_test_apk_manifest/AndroidManifest.xml',
# This list is shared with GN.
- # Defines a list of source files should be present in the open-source
- # chrome-apk but not in the published static_library which is included in the
- # real chrome for android.
- 'chrome_public_app_native_sources': [
+ # Defines a list of source files should be present in the Chrome app.
+ 'chrome_app_native_sources': [
'../app/android/chrome_main_delegate_android_initializer.cc',
'../browser/android/chrome_entry_point.cc',
],
+ # This list is only used by GN but kept here to mirror
+ # chrome_app_native_sources.
+ # Defines a list of source files should be present in the Chrome app when
+ # distributed as monochrome.
+ 'monochrome_app_native_sources': [
+ '../app/android/chrome_main_delegate_android_initializer.cc',
+ '../browser/android/monochrome_entry_point.cc',
+ ],
# This list is shared with GN.
'chrome_sync_shell_app_native_sources': [
@@ -120,10 +126,11 @@
},
{
# GN: //chrome/android:chrome_public
+ # TODO(yfriedman): Replace with libchrome.
'target_name': 'libchrome_public',
'type': 'shared_library',
'sources': [
- '<@(chrome_public_app_native_sources)',
+ '<@(chrome_app_native_sources)',
],
'dependencies': [
'libchrome_public_base',
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/browser/android/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698