| Index: build/config/compiler/BUILD.gn
|
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
| index dfe8af1ffbcdc3257c9d4286ba1a8dd5f67c80f8..ba44d1a3ffb293b4e2a156e9f898f2b31a946dad 100644
|
| --- a/build/config/compiler/BUILD.gn
|
| +++ b/build/config/compiler/BUILD.gn
|
| @@ -458,30 +458,18 @@ 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.
|
| - if (use_system_stlport) {
|
| - cflags += [
|
| - # For libstdc++/include, which is used by stlport.
|
| - "-I" + rebase_path("$android_src/bionic", root_build_dir),
|
| - "-I" + rebase_path("$android_src/external/stlport/stlport",
|
| - root_build_dir),
|
| - ]
|
| - libs += [
|
| - "stlport",
|
| - ]
|
| - } else {
|
| - android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
|
| + android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
|
|
|
| - cflags += [
|
| - "-isystem" + rebase_path("$android_stlport_root/stlport",
|
| - root_build_dir)
|
| - ]
|
| - lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
|
| + cflags += [
|
| + "-isystem" + rebase_path("$android_stlport_root/stlport",
|
| + root_build_dir)
|
| + ]
|
| + lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
|
|
|
| - if (component_mode == "shared_library") {
|
| - libs += [ "stlport_shared" ]
|
| - } else {
|
| - libs += [ "stlport_static" ]
|
| - }
|
| + if (component_mode == "shared_library") {
|
| + libs += [ "stlport_shared" ]
|
| + } else {
|
| + libs += [ "stlport_static" ]
|
| }
|
|
|
| if (cpu_arch == "mipsel") {
|
|
|