Issue 6531 - remove inspector and adapt for Android NDK r16b

gypfiles/standalone.gypi

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 297 matching lines @@
           'android_ndk_root%': '<(android_ndk_root)',
           'android_ndk_version%': '<(android_ndk_version)',
           'host_os%': '<(host_os)',
           'os_folder_name%': '<(os_folder_name)',
 
           'conditions': [
             ['target_arch == "ia32"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
               'android_target_arch%': 'x86',
               'android_target_platform%': '16',
+              'abi_target': 'i686-linux-android',
               'arm_version%': 'default',
             }],
             ['target_arch == "x64"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
               'android_target_arch%': 'x86_64',
               'android_target_platform%': '21',
+              'abi_target': 'x86_64-linux-android',
               'arm_version%': 'default',
             }],
             ['target_arch=="arm"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
               'android_target_arch%': 'arm',
               'android_target_platform%': '16',
+              'abi_target': 'arm-linux-androideabi',
               'arm_version%': 7,
             }],
             ['target_arch == "arm64"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
               'android_target_arch%': 'arm64',
               'android_target_platform%': '21',
+              'abi_target': 'aarch64-linux-android',
               'arm_version%': 'default',
             }],
             ['target_arch == "mipsel"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
               'android_target_arch%': 'mips',
               'android_target_platform%': '16',
+              'abi_target': 'mips-linux-android',
               'arm_version%': 'default',
             }],
             ['target_arch == "mips64el"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
               'android_target_arch%': 'mips64',
               'android_target_platform%': '21',
+              'abi_target': 'mips64el-linux-android',
               'arm_version%': 'default',
             }],
           ],
         },
 
         # Copy conditionally-set variables out one scope.
         'android_ndk_version%': '<(android_ndk_version)',
         'android_target_arch%': '<(android_target_arch)',
         'android_target_platform%': '<(android_target_platform)',
         'android_toolchain%': '<(android_toolchain)',
         'arm_version%': '<(arm_version)',
         'host_os%': '<(host_os)',
 
         # Print to stdout on Android.
         'v8_android_log_stdout%': 1,
 
         'conditions': [
           ['android_ndk_root==""', {
             'variables': {
               'android_sysroot': '<(android_toolchain)/sysroot/',
               'android_stl': '<(android_toolchain)/sources/cxx-stl/',
             },
             'conditions': [
               ['target_arch=="x64"', {
                 'android_lib': '<(android_sysroot)/usr/lib64',
               }, {
                 'android_lib': '<(android_sysroot)/usr/lib',
               }],
             ],
-            'android_libcpp_include': '<(android_stl)/llvm-libc++/libcxx/include',
-            'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/libcxxabi/include',
+            'android_libcpp_include': '<(android_stl)/llvm-libc++/include',
+            'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/include',
             'android_libcpp_libs': '<(android_stl)/llvm-libc++/libs',
             'android_support_include': '<(android_toolchain)/sources/android/support/include',
             'android_sysroot': '<(android_sysroot)',
           }, {
             'variables': {
-              'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_target_platform)/arch-<(android_target_arch)',
+              'android_sysroot': '<(android_ndk_root)/sysroot',
               'android_stl': '<(android_ndk_root)/sources/cxx-stl/',
             },
             'conditions': [
               ['target_arch=="x64"', {
                 'android_lib': '<(android_sysroot)/usr/lib64',
               }, {
                 'android_lib': '<(android_sysroot)/usr/lib',
               }],
             ],
-            'android_libcpp_include': '<(android_stl)/llvm-libc++/libcxx/include',
-            'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/libcxxabi/include',
+            'android_platform_sysroot': '<(android_ndk_root)/platforms/android-<(android_target_platform)/arch-<(android_target_arch)',
+            'android_libcpp_include': '<(android_stl)/llvm-libc++/include',
+            'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/include',
+            'android_libcpp_abi_target_include': '<(android_sysroot)/usr/include/<(abi_target)',
             'android_libcpp_libs': '<(android_stl)/llvm-libc++/libs',
             'android_support_include': '<(android_ndk_root)/sources/android/support/include',
             'android_sysroot': '<(android_sysroot)',
           }],
         ],
         'android_libcpp_library': 'c++_static',
       }],  # OS=="android"
       ['host_clang==1', {
         'conditions':[
           ['OS=="android"', {
@@ skipping 677 matching lines @@
         },
         'conditions': [
           ['werror==""', {
             'xcode_settings': {'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO'},
           }, {
             'xcode_settings': {'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'},
           }],
           ['clang==1', {
             'xcode_settings': {
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-              'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
             },
             'conditions': [
               ['clang_xcode==0', {
                 'xcode_settings': {
                   'CC': '<(clang_dir)/bin/clang',
                   'LDPLUSPLUS': '<(clang_dir)/bin/clang++',
                   'CLANG_CXX_LIBRARY': 'libc++'
                 },
               }],
               ['v8_target_arch=="x64" or v8_target_arch=="arm64" \
@@ skipping 16 matching lines @@
           'ANDROID',
         ],
         'configurations': {
           'Release': {
             'cflags': [
               '-fomit-frame-pointer',
             ],
           },  # Release
         },  # configurations
         'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter'],
-        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions',
-                       '-std=gnu++11' ],
+        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions' ],
         'target_conditions': [
           ['_toolset=="target"', {
             'cflags!': [
               '-pthread',  # Not supported by Android toolchain.
             ],
             'cflags': [
               '-ffunction-sections',
               '-funwind-tables',
               '-fstack-protector',
               '-fno-short-enums',
               '-finline-limit=64',
               '-Wa,--noexecstack',
               '--sysroot=<(android_sysroot)',
             ],
             'cflags_cc': [
+              '-isystem<(android_libcpp_abi_target_include)',
               '-isystem<(android_libcpp_include)',
               '-isystem<(android_libcpp_abi_include)',
               '-isystem<(android_support_include)',
             ],
             'defines': [
               'ANDROID',
               #'__GNU_SOURCE=1',  # Necessary for clone()
               'HAVE_OFF64_T',
               'HAVE_SYS_UIO_H',
               'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize.
               'ANDROID_NDK_VERSION=<(android_ndk_version)',
             ],
             'ldflags!': [
               '-pthread',  # Not supported by Android toolchain.
             ],
             'ldflags': [
               '-Wl,--no-undefined',
-              '--sysroot=<(android_sysroot)',
+              '--sysroot=<(android_platform_sysroot)',
               '-nostdlib',
             ],
             'libraries!': [
                 '-lrt',  # librt is built into Bionic.
                 # Not supported by Android toolchain.
                 # Where do these come from?  Can't find references in
                 # any Chromium gyp or gypi file.  Maybe they come from
                 # gyp itself?
                 '-lpthread', '-lnss3', '-lnssutil3', '-lsmime3', '-lplds4', '-lplc4', '-lnspr4',
               ],
@@ skipping 229 matching lines @@
             ['CC_wrapper', '<(base_dir)/gypfiles/coverage_wrapper.py'],
             ['CXX_wrapper', '<(base_dir)/gypfiles/coverage_wrapper.py'],
             ['CC.host_wrapper', '<(base_dir)/gypfiles/coverage_wrapper.py'],
             ['CXX.host_wrapper', '<(base_dir)/gypfiles/coverage_wrapper.py'],
           ],
         }],
       ],
     }],
   ],
 }