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

Unified Diff: build/config/compiler/BUILD.gn

Issue 1231723002: Android GN: Include libstdc++.so when doing a component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn11
Patch Set: Fix create_native_executable_dist() not including lib paths Created 5 years, 5 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 | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 377f99ab8b4e3767120899512862cfe4c6cc60ce..4850471f4961b1911a437506c931a60974011a67 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -651,8 +651,6 @@ config("runtime_library") {
# arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit
# strange errors. The include ordering here is important; change with
# caution.
- android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++"
-
cflags += [
"-isystem" +
rebase_path("$android_libcpp_root/libcxx/include", root_build_dir),
@@ -665,13 +663,6 @@ config("runtime_library") {
]
lib_dirs += [ "$android_libcpp_root/libs/$android_app_abi" ]
-
- if (component_mode == "shared_library") {
- android_libcpp_library = "c++_shared"
- } else {
- android_libcpp_library = "c++_static"
- }
-
libs += [ "$android_libcpp_library" ]
if (current_cpu == "mipsel") {
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698