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

Unified Diff: content/shell/android/BUILD.gn

Issue 1473273002: GN(Android): Add libosmesa.so to ContentShell.apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 5 years 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 | « build/toolchain/gcc_toolchain.gni ('k') | third_party/mesa/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/BUILD.gn
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index bbffa7387f5ebf91627e559ef115091760ab832e..3c6af4d6e44cc7972f0fb412237ff80ce051d9dc 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -111,16 +111,13 @@ android_apk("content_shell_apk") {
"//content/public/android:content_java",
"//media/base/android:media_java",
"//net/android:net_java",
-
- #"//third_party/mesa:osmesa_in_lib_dir",
+ "//third_party/mesa:osmesa",
"//ui/android:ui_java",
]
apk_name = "ContentShell"
android_manifest = content_shell_manifest
native_libs = [ "libcontent_shell_content_view.so" ]
-
- # TODO(GYP)
- #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
+ loadable_modules = [ "$root_out_dir/libosmesa.so" ]
}
android_library("content_shell_test_java") {
« no previous file with comments | « build/toolchain/gcc_toolchain.gni ('k') | third_party/mesa/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698