diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /base | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'base')
121 files changed, 1378 insertions, 579 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index 3d07813a6d..28967dbf61 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -111,7 +111,7 @@ component("base") { "cpu.cc", "cpu.h", "critical_closure.h", - "critical_closure_ios.mm", + "critical_closure_internal_ios.mm", "debug/alias.cc", "debug/alias.h", "debug/crash_logging.cc", @@ -10,8 +10,9 @@ include_rules = [ "+third_party/modp_b64", "+third_party/tcmalloc", - # IPC is implicitly brought in from the root, and we don't want it. + # These are implicitly brought in from the root, and we don't want them. "-ipc", + "-url", # ICU dependendencies must be separate from the rest of base. "-i18n", diff --git a/base/allocator/allocator_extension_thunks.target.darwin-arm.mk b/base/allocator/allocator_extension_thunks.target.darwin-arm.mk index 37a79c43cf..85994520ff 100644 --- a/base/allocator/allocator_extension_thunks.target.darwin-arm.mk +++ b/base/allocator/allocator_extension_thunks.target.darwin-arm.mk @@ -40,7 +40,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -127,7 +126,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/allocator/allocator_extension_thunks.target.darwin-x86.mk b/base/allocator/allocator_extension_thunks.target.darwin-x86.mk index f8ac07f5fb..eab0b63fd3 100644 --- a/base/allocator/allocator_extension_thunks.target.darwin-x86.mk +++ b/base/allocator/allocator_extension_thunks.target.darwin-x86.mk @@ -42,7 +42,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -129,7 +128,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/allocator/allocator_extension_thunks.target.darwin-x86_64.mk b/base/allocator/allocator_extension_thunks.target.darwin-x86_64.mk index 780e341c53..3dbcf95350 100644 --- a/base/allocator/allocator_extension_thunks.target.darwin-x86_64.mk +++ b/base/allocator/allocator_extension_thunks.target.darwin-x86_64.mk @@ -42,7 +42,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -129,7 +128,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/allocator/allocator_extension_thunks.target.linux-arm.mk b/base/allocator/allocator_extension_thunks.target.linux-arm.mk index 37a79c43cf..85994520ff 100644 --- a/base/allocator/allocator_extension_thunks.target.linux-arm.mk +++ b/base/allocator/allocator_extension_thunks.target.linux-arm.mk @@ -40,7 +40,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -127,7 +126,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/allocator/allocator_extension_thunks.target.linux-x86.mk b/base/allocator/allocator_extension_thunks.target.linux-x86.mk index f8ac07f5fb..eab0b63fd3 100644 --- a/base/allocator/allocator_extension_thunks.target.linux-x86.mk +++ b/base/allocator/allocator_extension_thunks.target.linux-x86.mk @@ -42,7 +42,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -129,7 +128,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/allocator/allocator_extension_thunks.target.linux-x86_64.mk b/base/allocator/allocator_extension_thunks.target.linux-x86_64.mk index 780e341c53..3dbcf95350 100644 --- a/base/allocator/allocator_extension_thunks.target.linux-x86_64.mk +++ b/base/allocator/allocator_extension_thunks.target.linux-x86_64.mk @@ -42,7 +42,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -129,7 +128,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc index 96c5980362..6c7ac5bfa5 100644 --- a/base/android/jni_array.cc +++ b/base/android/jni_array.cc @@ -189,12 +189,13 @@ void JavaArrayOfByteArrayToStringVector( jsize len = env->GetArrayLength(array); out->resize(len); for (jsize i = 0; i < len; ++i) { - jbyteArray bytes_array = static_cast<jbyteArray>( - env->GetObjectArrayElement(array, i)); - jsize bytes_len = env->GetArrayLength(bytes_array); - jbyte* bytes = env->GetByteArrayElements(bytes_array, NULL); + ScopedJavaLocalRef<jbyteArray> bytes_array( + env, static_cast<jbyteArray>( + env->GetObjectArrayElement(array, i))); + jsize bytes_len = env->GetArrayLength(bytes_array.obj()); + jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), NULL); (*out)[i].assign(reinterpret_cast<const char*>(bytes), bytes_len); - env->ReleaseByteArrayElements(bytes_array, bytes, JNI_ABORT); + env->ReleaseByteArrayElements(bytes_array.obj(), bytes, JNI_ABORT); } } diff --git a/base/android/jni_generator/android_jar.classes b/base/android/jni_generator/android_jar.classes new file mode 100644 index 0000000000..7d412cee47 --- /dev/null +++ b/base/android/jni_generator/android_jar.classes @@ -0,0 +1,98 @@ +java/lang/AbstractMethodError.class +java/lang/AbstractStringBuilder.class +java/lang/Appendable.class +java/lang/ArithmeticException.class +java/lang/ArrayIndexOutOfBoundsException.class +java/lang/ArrayStoreException.class +java/lang/AssertionError.class +java/lang/AutoCloseable.class +java/lang/Boolean.class +java/lang/Byte.class +java/lang/Character.class +java/lang/Character$Subset.class +java/lang/Character$UnicodeBlock.class +java/lang/CharSequence.class +java/lang/ClassCastException.class +java/lang/ClassCircularityError.class +java/lang/Class.class +java/lang/ClassFormatError.class +java/lang/ClassLoader.class +java/lang/ClassNotFoundException.class +java/lang/Cloneable.class +java/lang/CloneNotSupportedException.class +java/lang/Comparable.class +java/lang/Compiler.class +java/lang/Deprecated.class +java/lang/Double.class +java/lang/Enum.class +java/lang/EnumConstantNotPresentException.class +java/lang/Error.class +java/lang/Exception.class +java/lang/ExceptionInInitializerError.class +java/lang/Float.class +java/lang/IllegalAccessError.class +java/lang/IllegalAccessException.class +java/lang/IllegalArgumentException.class +java/lang/IllegalMonitorStateException.class +java/lang/IllegalStateException.class +java/lang/IncompatibleClassChangeError.class +java/lang/IndexOutOfBoundsException.class +java/lang/InheritableThreadLocal.class +java/lang/InstantiationError.class +java/lang/InstantiationException.class +java/lang/Integer.class +java/lang/InternalError.class +java/lang/InterruptedException.class +java/lang/Iterable.class +java/lang/LinkageError.class +java/lang/Long.class +java/lang/Math.class +java/lang/NegativeArraySizeException.class +java/lang/NoClassDefFoundError.class +java/lang/NoSuchFieldError.class +java/lang/NoSuchFieldException.class +java/lang/NoSuchMethodError.class +java/lang/NoSuchMethodException.class +java/lang/NullPointerException.class +java/lang/Number.class +java/lang/NumberFormatException.class +java/lang/Object.class +java/lang/OutOfMemoryError.class +java/lang/Override.class +java/lang/Package.class +java/lang/ProcessBuilder.class +java/lang/Process.class +java/lang/Readable.class +java/lang/ReflectiveOperationException.class +java/lang/Runnable.class +java/lang/Runtime.class +java/lang/RuntimeException.class +java/lang/RuntimePermission.class +java/lang/SafeVarargs.class +java/lang/SecurityException.class +java/lang/SecurityManager.class +java/lang/Short.class +java/lang/StackOverflowError.class +java/lang/StackTraceElement.class +java/lang/StrictMath.class +java/lang/StringBuffer.class +java/lang/StringBuilder.class +java/lang/String.class +java/lang/StringIndexOutOfBoundsException.class +java/lang/SuppressWarnings.class +java/lang/System.class +java/lang/Thread.class +java/lang/ThreadDeath.class +java/lang/ThreadGroup.class +java/lang/ThreadLocal.class +java/lang/Thread$State.class +java/lang/Thread$UncaughtExceptionHandler.class +java/lang/Throwable.class +java/lang/TypeNotPresentException.class +java/lang/UnknownError.class +java/lang/UnsatisfiedLinkError.class +java/lang/UnsupportedClassVersionError.class +java/lang/UnsupportedOperationException.class +java/lang/VerifyError.class +java/lang/VirtualMachineError.class +java/lang/Void.class diff --git a/base/android/jni_generator/golden_sample_for_tests_jni.h b/base/android/jni_generator/golden_sample_for_tests_jni.h index b90bb9fe31..7dbf71eb99 100644 --- a/base/android/jni_generator/golden_sample_for_tests_jni.h +++ b/base/android/jni_generator/golden_sample_for_tests_jni.h @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kInnerStructAClassPath[] = @@ -92,8 +94,9 @@ static jstring ReturnAString(JNIEnv* env, jobject jcaller, } static base::subtle::AtomicWord g_SampleForTests_javaMethod = 0; -static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj, jint foo, - jint bar) { +static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj, + JniIntWrapper foo, + JniIntWrapper bar) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_SampleForTests_clazz, 0); @@ -112,7 +115,7 @@ static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj, jint foo, jint ret = env->CallIntMethod(obj, - method_id, foo, bar); + method_id, as_jint(foo), as_jint(bar)); jni_generator::CheckException(env); return ret; } @@ -188,7 +191,7 @@ static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, jobject static base::subtle::AtomicWord g_InnerStructA_create = 0; static base::android::ScopedJavaLocalRef<jobject> Java_InnerStructA_create(JNIEnv* env, jlong l, - jint i, + JniIntWrapper i, jstring s) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_InnerStructA_clazz, @@ -209,7 +212,7 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallStaticObjectMethod(g_InnerStructA_clazz, - method_id, l, i, s); + method_id, l, as_jint(i), s); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } diff --git a/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java index 885a6c32af..df8b80f910 100644 --- a/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java +++ b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java @@ -71,6 +71,21 @@ import java.util.List; // directly call methods on the other side. It's much simpler than trying to amalgamate // java and stl containers. // +// An important note about qualified class name resolution: +// The generator doesn't compile the class and have little context about the +// classes being passed through the JNI layers. It adds a few simple rules: +// +// - all classes are either explicitly imported, or they are assumed to be in +// the same package. +// +// - Inner class needs to be done through an import and usage of the +// outer class, so that the generator knows how to qualify it: +// import foo.bar.Zoo; +// void call(Zoo.Inner); +// +// - implicitly imported classes aren't supported, so in order to pass +// things like Runnable, please import java.lang.Runnable; +// // This JNINamespace annotation indicates that all native methods should be // generated inside this namespace, including the native class that this // object binds to. diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py index 9984c2a286..32d09f1b8d 100755 --- a/base/android/jni_generator/jni_generator.py +++ b/base/android/jni_generator/jni_generator.py @@ -124,6 +124,14 @@ def JavaDataTypeToC(java_type): return 'jobject' +def JavaDataTypeToCForCalledByNativeParam(java_type): + """Returns a C datatype to be when calling from native.""" + if java_type == 'int': + return 'JniIntWrapper' + else: + return JavaDataTypeToC(java_type) + + def JavaReturnValueToC(java_type): """Returns a valid C return value for the given java type.""" java_pod_type_map = { @@ -146,6 +154,7 @@ class JniParams(object): _package = '' _inner_classes = [] _remappings = [] + _implicit_imports = [] @staticmethod def SetFullyQualifiedClass(fully_qualified_class): @@ -193,6 +202,7 @@ class JniParams(object): 'Ljava/lang/String', 'Ljava/lang/Class', ] + prefix = '' # Array? while param[-2:] == '[]': @@ -246,11 +256,33 @@ class JniParams(object): (param, JniParams._package.replace('/', '.'), outer.replace('/', '.'))) + JniParams._CheckImplicitImports(param) + # Type not found, falling back to same package as this class. return (prefix + 'L' + JniParams.RemapClassName(JniParams._package + '/' + param) + ';') @staticmethod + def _CheckImplicitImports(param): + # Ensure implicit imports, such as java.lang.*, are not being treated + # as being in the same package. + if not JniParams._implicit_imports: + # This file was generated from android.jar and lists + # all classes that are implicitly imported. + with file(os.path.join(os.path.dirname(sys.argv[0]), + 'android_jar.classes'), 'r') as f: + JniParams._implicit_imports = f.readlines() + for implicit_import in JniParams._implicit_imports: + implicit_import = implicit_import.strip().replace('.class', '') + implicit_import = implicit_import.replace('/', '.') + if implicit_import.endswith('.' + param): + raise SyntaxError('Ambiguous class (%s) can not be used directly ' + 'by JNI.\nPlease import it, probably:\n\n' + 'import %s;' % + (param, implicit_import)) + + + @staticmethod def Signature(params, returns, wrap): """Returns the JNI signature for the given datatypes.""" items = ['('] @@ -672,6 +704,8 @@ class InlHeaderFileGenerator(object): ${INCLUDES} +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { $CLASS_PATH_DEFINITIONS @@ -932,9 +966,10 @@ Java_${FULLY_QUALIFIED_CLASS}_${INIT_NATIVE_NAME}(JNIEnv* env, jclass clazz) { for param in native.params]) def GetCalledByNativeParamsInDeclaration(self, called_by_native): - return ',\n '.join([JavaDataTypeToC(param.datatype) + ' ' + - param.name - for param in called_by_native.params]) + return ',\n '.join([ + JavaDataTypeToCForCalledByNativeParam(param.datatype) + ' ' + + param.name + for param in called_by_native.params]) def GetForwardDeclaration(self, native): template = Template(""" @@ -978,6 +1013,14 @@ static ${RETURN} ${NAME}(JNIEnv* env, ${PARAMS_IN_DECLARATION}) { } return template.substitute(values) + def GetArgument(self, param): + return ('as_jint(' + param.name + ')' + if param.datatype == 'int' else param.name) + + def GetArgumentsInCall(self, params): + """Return a string of arguments to call from native into Java""" + return [self.GetArgument(p) for p in params] + def GetCalledByNativeValues(self, called_by_native): """Fills in necessary values for the CalledByNative methods.""" if called_by_native.static or called_by_native.is_constructor: @@ -992,7 +1035,7 @@ static ${RETURN} ${NAME}(JNIEnv* env, ${PARAMS_IN_DECLARATION}) { called_by_native) if params_in_declaration: params_in_declaration = ', ' + params_in_declaration - params_in_call = ', '.join(param.name for param in called_by_native.params) + params_in_call = ', '.join(self.GetArgumentsInCall(called_by_native.params)) if params_in_call: params_in_call = ', ' + params_in_call pre_call = '' diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py index 61d76c8d01..9e586f9372 100755 --- a/base/android/jni_generator/jni_generator_tests.py +++ b/base/android/jni_generator/jni_generator_tests.py @@ -1010,6 +1010,29 @@ class Foo { TestOptions()) self.assertRaises(SyntaxError, willRaise) + def testImplicitImport(self): + test_data = """ + package org.chromium.android_webview; + + %(IMPORT)s + + @CalledByNative + private static void clientCertificatesCleared(Runnable callback) { + if (callbaback == null) return; + callback.run(); + } + """ + def generate(import_clause): + jni_generator.JNIFromJavaSource( + test_data % {'IMPORT': import_clause}, + 'org/chromium/android_webview/AwContentStatics', + TestOptions()) + # Ensure it raises without the import. + self.assertRaises(SyntaxError, lambda: generate('')) + + # Ensure it's fine with the import. + generate('import java.lang.Runnable;') + if __name__ == '__main__': unittest.main() diff --git a/base/android/jni_generator/testCalledByNatives.golden b/base/android/jni_generator/testCalledByNatives.golden index 854275ccbf..abdc50740b 100644 --- a/base/android/jni_generator/testCalledByNatives.golden +++ b/base/android/jni_generator/testCalledByNatives.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestJniClassPath[] = "org/chromium/TestJni"; @@ -29,7 +31,7 @@ jclass g_InfoBar_clazz = NULL; static base::subtle::AtomicWord g_TestJni_showConfirmInfoBar = 0; static base::android::ScopedJavaLocalRef<jobject> - Java_TestJni_showConfirmInfoBar(JNIEnv* env, jobject obj, jint + Java_TestJni_showConfirmInfoBar(JNIEnv* env, jobject obj, JniIntWrapper nativeInfoBar, jstring buttonOk, jstring buttonCancel, @@ -56,14 +58,15 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallObjectMethod(obj, - method_id, nativeInfoBar, buttonOk, buttonCancel, title, icon); + method_id, as_jint(nativeInfoBar), buttonOk, buttonCancel, title, + icon); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } static base::subtle::AtomicWord g_TestJni_showAutoLoginInfoBar = 0; static base::android::ScopedJavaLocalRef<jobject> - Java_TestJni_showAutoLoginInfoBar(JNIEnv* env, jobject obj, jint + Java_TestJni_showAutoLoginInfoBar(JNIEnv* env, jobject obj, JniIntWrapper nativeInfoBar, jstring realm, jstring account, @@ -88,7 +91,7 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallObjectMethod(obj, - method_id, nativeInfoBar, realm, account, args); + method_id, as_jint(nativeInfoBar), realm, account, args); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } @@ -173,10 +176,10 @@ static base::android::ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv* static base::subtle::AtomicWord g_TestJni_activateHardwareAcceleration = 0; static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj, jboolean activated, - jint iPid, - jint iType, - jint iPrimaryID, - jint iSecondaryID) { + JniIntWrapper iPid, + JniIntWrapper iType, + JniIntWrapper iPrimaryID, + JniIntWrapper iSecondaryID) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_TestJni_clazz); @@ -197,13 +200,15 @@ static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj, &g_TestJni_activateHardwareAcceleration); env->CallVoidMethod(obj, - method_id, activated, iPid, iType, iPrimaryID, iSecondaryID); + method_id, activated, as_jint(iPid), as_jint(iType), + as_jint(iPrimaryID), as_jint(iSecondaryID)); jni_generator::CheckException(env); } static base::subtle::AtomicWord g_TestJni_uncheckedCall = 0; -static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, jint iParam) { +static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, JniIntWrapper + iParam) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_TestJni_clazz); @@ -220,7 +225,7 @@ static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, jint iParam) { &g_TestJni_uncheckedCall); env->CallVoidMethod(obj, - method_id, iParam); + method_id, as_jint(iParam)); } diff --git a/base/android/jni_generator/testConstantsFromJavaP.golden b/base/android/jni_generator/testConstantsFromJavaP.golden index 2465c52bb2..795bd547f2 100644 --- a/base/android/jni_generator/testConstantsFromJavaP.golden +++ b/base/android/jni_generator/testConstantsFromJavaP.golden @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kMotionEventClassPath[] = "android/view/MotionEvent"; @@ -136,34 +138,34 @@ static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_I_LAVMEPP_LAVMEPC_I_I_F_F_I_I_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, - jint p3, + JniIntWrapper p2, + JniIntWrapper p3, jobjectArray p4, jobjectArray p5, - jint p6, - jint p7, + JniIntWrapper p6, + JniIntWrapper p7, jfloat p8, jfloat p9, - jint p10, - jint p11, - jint p12, - jint p13) __attribute__ ((unused)); + JniIntWrapper p10, + JniIntWrapper p11, + JniIntWrapper p12, + JniIntWrapper p13) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_I_LAVMEPP_LAVMEPC_I_I_F_F_I_I_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, - jint p3, + JniIntWrapper p2, + JniIntWrapper p3, jobjectArray p4, jobjectArray p5, - jint p6, - jint p7, + JniIntWrapper p6, + JniIntWrapper p7, jfloat p8, jfloat p9, - jint p10, - jint p11, - jint p12, - jint p13) { + JniIntWrapper p10, + JniIntWrapper p11, + JniIntWrapper p12, + JniIntWrapper p13) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -177,8 +179,9 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, - p13); + method_id, p0, p1, as_jint(p2), as_jint(p3), p4, p5, as_jint(p6), + as_jint(p7), p8, p9, as_jint(p10), as_jint(p11), as_jint(p12), + as_jint(p13)); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } @@ -189,32 +192,32 @@ static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_I_AI_LAVMEPC_I_F_F_I_I_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, - jint p3, + JniIntWrapper p2, + JniIntWrapper p3, jintArray p4, jobjectArray p5, - jint p6, + JniIntWrapper p6, jfloat p7, jfloat p8, - jint p9, - jint p10, - jint p11, - jint p12) __attribute__ ((unused)); + JniIntWrapper p9, + JniIntWrapper p10, + JniIntWrapper p11, + JniIntWrapper p12) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_I_AI_LAVMEPC_I_F_F_I_I_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, - jint p3, + JniIntWrapper p2, + JniIntWrapper p3, jintArray p4, jobjectArray p5, - jint p6, + JniIntWrapper p6, jfloat p7, jfloat p8, - jint p9, - jint p10, - jint p11, - jint p12) { + JniIntWrapper p9, + JniIntWrapper p10, + JniIntWrapper p11, + JniIntWrapper p12) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -228,7 +231,8 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); + method_id, p0, p1, as_jint(p2), as_jint(p3), p4, p5, as_jint(p6), p7, + p8, as_jint(p9), as_jint(p10), as_jint(p11), as_jint(p12)); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } @@ -238,29 +242,29 @@ static base::subtle::AtomicWord g_MotionEvent_obtainAVME_J_J_I_F_F_F_F_I_F_F_I_I static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_F_F_F_F_I_F_F_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, + JniIntWrapper p2, jfloat p3, jfloat p4, jfloat p5, jfloat p6, - jint p7, + JniIntWrapper p7, jfloat p8, jfloat p9, - jint p10, - jint p11) __attribute__ ((unused)); + JniIntWrapper p10, + JniIntWrapper p11) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_F_F_F_F_I_F_F_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, + JniIntWrapper p2, jfloat p3, jfloat p4, jfloat p5, jfloat p6, - jint p7, + JniIntWrapper p7, jfloat p8, jfloat p9, - jint p10, - jint p11) { + JniIntWrapper p10, + JniIntWrapper p11) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -274,7 +278,8 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); + method_id, p0, p1, as_jint(p2), p3, p4, p5, p6, as_jint(p7), p8, p9, + as_jint(p10), as_jint(p11)); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } @@ -284,31 +289,31 @@ static base::subtle::AtomicWord static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_I_F_F_F_F_I_F_F_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, - jint p3, + JniIntWrapper p2, + JniIntWrapper p3, jfloat p4, jfloat p5, jfloat p6, jfloat p7, - jint p8, + JniIntWrapper p8, jfloat p9, jfloat p10, - jint p11, - jint p12) __attribute__ ((unused)); + JniIntWrapper p11, + JniIntWrapper p12) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_I_F_F_F_F_I_F_F_I_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, - jint p3, + JniIntWrapper p2, + JniIntWrapper p3, jfloat p4, jfloat p5, jfloat p6, jfloat p7, - jint p8, + JniIntWrapper p8, jfloat p9, jfloat p10, - jint p11, - jint p12) { + JniIntWrapper p11, + JniIntWrapper p12) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -322,7 +327,8 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); + method_id, p0, p1, as_jint(p2), as_jint(p3), p4, p5, p6, p7, + as_jint(p8), p9, p10, as_jint(p11), as_jint(p12)); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } @@ -331,17 +337,17 @@ static base::subtle::AtomicWord g_MotionEvent_obtainAVME_J_J_I_F_F_I = 0; static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_F_F_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, + JniIntWrapper p2, jfloat p3, jfloat p4, - jint p5) __attribute__ ((unused)); + JniIntWrapper p5) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jobject> Java_MotionEvent_obtainAVME_J_J_I_F_F_I(JNIEnv* env, jlong p0, jlong p1, - jint p2, + JniIntWrapper p2, jfloat p3, jfloat p4, - jint p5) { + JniIntWrapper p5) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -355,7 +361,7 @@ static base::android::ScopedJavaLocalRef<jobject> jobject ret = env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0, p1, p2, p3, p4, p5); + method_id, p0, p1, as_jint(p2), p3, p4, as_jint(p5)); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jobject>(env, ret); } @@ -474,9 +480,10 @@ static jint Java_MotionEvent_getSource(JNIEnv* env, jobject obj) { } static base::subtle::AtomicWord g_MotionEvent_setSource = 0; -static void Java_MotionEvent_setSource(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static void Java_MotionEvent_setSource(JNIEnv* env, jobject obj, jint p0) { +static void Java_MotionEvent_setSource(JNIEnv* env, jobject obj, JniIntWrapper + p0) __attribute__ ((unused)); +static void Java_MotionEvent_setSource(JNIEnv* env, jobject obj, JniIntWrapper + p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz); @@ -489,7 +496,7 @@ static void Java_MotionEvent_setSource(JNIEnv* env, jobject obj, jint p0) { &g_MotionEvent_setSource); env->CallVoidMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); } @@ -825,10 +832,10 @@ static jfloat Java_MotionEvent_getOrientationF(JNIEnv* env, jobject obj) { } static base::subtle::AtomicWord g_MotionEvent_getAxisValueF_I = 0; -static jfloat Java_MotionEvent_getAxisValueF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getAxisValueF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getAxisValueF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getAxisValueF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -842,7 +849,7 @@ static jfloat Java_MotionEvent_getAxisValueF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } @@ -870,9 +877,10 @@ static jint Java_MotionEvent_getPointerCount(JNIEnv* env, jobject obj) { } static base::subtle::AtomicWord g_MotionEvent_getPointerId = 0; -static jint Java_MotionEvent_getPointerId(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jint Java_MotionEvent_getPointerId(JNIEnv* env, jobject obj, jint p0) { +static jint Java_MotionEvent_getPointerId(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jint Java_MotionEvent_getPointerId(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -886,15 +894,16 @@ static jint Java_MotionEvent_getPointerId(JNIEnv* env, jobject obj, jint p0) { jint ret = env->CallIntMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getToolType = 0; -static jint Java_MotionEvent_getToolType(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jint Java_MotionEvent_getToolType(JNIEnv* env, jobject obj, jint p0) { +static jint Java_MotionEvent_getToolType(JNIEnv* env, jobject obj, JniIntWrapper + p0) __attribute__ ((unused)); +static jint Java_MotionEvent_getToolType(JNIEnv* env, jobject obj, JniIntWrapper + p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -908,16 +917,16 @@ static jint Java_MotionEvent_getToolType(JNIEnv* env, jobject obj, jint p0) { jint ret = env->CallIntMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_findPointerIndex = 0; -static jint Java_MotionEvent_findPointerIndex(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jint Java_MotionEvent_findPointerIndex(JNIEnv* env, jobject obj, jint p0) - { +static jint Java_MotionEvent_findPointerIndex(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jint Java_MotionEvent_findPointerIndex(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -931,15 +940,16 @@ static jint Java_MotionEvent_findPointerIndex(JNIEnv* env, jobject obj, jint p0) jint ret = env->CallIntMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getXF_I = 0; -static jfloat Java_MotionEvent_getXF_I(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jfloat Java_MotionEvent_getXF_I(JNIEnv* env, jobject obj, jint p0) { +static jfloat Java_MotionEvent_getXF_I(JNIEnv* env, jobject obj, JniIntWrapper + p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getXF_I(JNIEnv* env, jobject obj, JniIntWrapper + p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -953,15 +963,16 @@ static jfloat Java_MotionEvent_getXF_I(JNIEnv* env, jobject obj, jint p0) { jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getYF_I = 0; -static jfloat Java_MotionEvent_getYF_I(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jfloat Java_MotionEvent_getYF_I(JNIEnv* env, jobject obj, jint p0) { +static jfloat Java_MotionEvent_getYF_I(JNIEnv* env, jobject obj, JniIntWrapper + p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getYF_I(JNIEnv* env, jobject obj, JniIntWrapper + p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -975,16 +986,16 @@ static jfloat Java_MotionEvent_getYF_I(JNIEnv* env, jobject obj, jint p0) { jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getPressureF_I = 0; -static jfloat Java_MotionEvent_getPressureF_I(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jfloat Java_MotionEvent_getPressureF_I(JNIEnv* env, jobject obj, jint p0) - { +static jfloat Java_MotionEvent_getPressureF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getPressureF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -998,15 +1009,16 @@ static jfloat Java_MotionEvent_getPressureF_I(JNIEnv* env, jobject obj, jint p0) jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getSizeF_I = 0; -static jfloat Java_MotionEvent_getSizeF_I(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static jfloat Java_MotionEvent_getSizeF_I(JNIEnv* env, jobject obj, jint p0) { +static jfloat Java_MotionEvent_getSizeF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getSizeF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1020,16 +1032,16 @@ static jfloat Java_MotionEvent_getSizeF_I(JNIEnv* env, jobject obj, jint p0) { jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getTouchMajorF_I = 0; -static jfloat Java_MotionEvent_getTouchMajorF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getTouchMajorF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getTouchMajorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getTouchMajorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1043,16 +1055,16 @@ static jfloat Java_MotionEvent_getTouchMajorF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getTouchMinorF_I = 0; -static jfloat Java_MotionEvent_getTouchMinorF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getTouchMinorF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getTouchMinorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getTouchMinorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1066,16 +1078,16 @@ static jfloat Java_MotionEvent_getTouchMinorF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getToolMajorF_I = 0; -static jfloat Java_MotionEvent_getToolMajorF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getToolMajorF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getToolMajorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getToolMajorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1089,16 +1101,16 @@ static jfloat Java_MotionEvent_getToolMajorF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getToolMinorF_I = 0; -static jfloat Java_MotionEvent_getToolMinorF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getToolMinorF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getToolMinorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getToolMinorF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1112,16 +1124,16 @@ static jfloat Java_MotionEvent_getToolMinorF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getOrientationF_I = 0; -static jfloat Java_MotionEvent_getOrientationF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getOrientationF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getOrientationF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getOrientationF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1135,18 +1147,18 @@ static jfloat Java_MotionEvent_getOrientationF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getAxisValueF_I_I = 0; -static jfloat Java_MotionEvent_getAxisValueF_I_I(JNIEnv* env, jobject obj, jint - p0, - jint p1) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getAxisValueF_I_I(JNIEnv* env, jobject obj, jint - p0, - jint p1) { +static jfloat Java_MotionEvent_getAxisValueF_I_I(JNIEnv* env, jobject obj, + JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getAxisValueF_I_I(JNIEnv* env, jobject obj, + JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1160,15 +1172,17 @@ static jfloat Java_MotionEvent_getAxisValueF_I_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getPointerCoords = 0; -static void Java_MotionEvent_getPointerCoords(JNIEnv* env, jobject obj, jint p0, +static void Java_MotionEvent_getPointerCoords(JNIEnv* env, jobject obj, + JniIntWrapper p0, jobject p1) __attribute__ ((unused)); -static void Java_MotionEvent_getPointerCoords(JNIEnv* env, jobject obj, jint p0, +static void Java_MotionEvent_getPointerCoords(JNIEnv* env, jobject obj, + JniIntWrapper p0, jobject p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, @@ -1182,17 +1196,17 @@ static void Java_MotionEvent_getPointerCoords(JNIEnv* env, jobject obj, jint p0, &g_MotionEvent_getPointerCoords); env->CallVoidMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), p1); jni_generator::CheckException(env); } static base::subtle::AtomicWord g_MotionEvent_getPointerProperties = 0; -static void Java_MotionEvent_getPointerProperties(JNIEnv* env, jobject obj, jint - p0, +static void Java_MotionEvent_getPointerProperties(JNIEnv* env, jobject obj, + JniIntWrapper p0, jobject p1) __attribute__ ((unused)); -static void Java_MotionEvent_getPointerProperties(JNIEnv* env, jobject obj, jint - p0, +static void Java_MotionEvent_getPointerProperties(JNIEnv* env, jobject obj, + JniIntWrapper p0, jobject p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, @@ -1206,7 +1220,7 @@ static void Java_MotionEvent_getPointerProperties(JNIEnv* env, jobject obj, jint &g_MotionEvent_getPointerProperties); env->CallVoidMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), p1); jni_generator::CheckException(env); } @@ -1367,9 +1381,9 @@ static jint Java_MotionEvent_getHistorySize(JNIEnv* env, jobject obj) { static base::subtle::AtomicWord g_MotionEvent_getHistoricalEventTime = 0; static jlong Java_MotionEvent_getHistoricalEventTime(JNIEnv* env, jobject obj, - jint p0) __attribute__ ((unused)); + JniIntWrapper p0) __attribute__ ((unused)); static jlong Java_MotionEvent_getHistoricalEventTime(JNIEnv* env, jobject obj, - jint p0) { + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1383,16 +1397,16 @@ static jlong Java_MotionEvent_getHistoricalEventTime(JNIEnv* env, jobject obj, jlong ret = env->CallLongMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalXF_I = 0; -static jfloat Java_MotionEvent_getHistoricalXF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getHistoricalXF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getHistoricalXF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getHistoricalXF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1406,16 +1420,16 @@ static jfloat Java_MotionEvent_getHistoricalXF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalYF_I = 0; -static jfloat Java_MotionEvent_getHistoricalYF_I(JNIEnv* env, jobject obj, jint - p0) __attribute__ ((unused)); -static jfloat Java_MotionEvent_getHistoricalYF_I(JNIEnv* env, jobject obj, jint - p0) { +static jfloat Java_MotionEvent_getHistoricalYF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static jfloat Java_MotionEvent_getHistoricalYF_I(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1429,16 +1443,16 @@ static jfloat Java_MotionEvent_getHistoricalYF_I(JNIEnv* env, jobject obj, jint jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalPressureF_I = 0; static jfloat Java_MotionEvent_getHistoricalPressureF_I(JNIEnv* env, jobject - obj, jint p0) __attribute__ ((unused)); + obj, JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalPressureF_I(JNIEnv* env, jobject - obj, jint p0) { + obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1452,16 +1466,16 @@ static jfloat Java_MotionEvent_getHistoricalPressureF_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalSizeF_I = 0; static jfloat Java_MotionEvent_getHistoricalSizeF_I(JNIEnv* env, jobject obj, - jint p0) __attribute__ ((unused)); + JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalSizeF_I(JNIEnv* env, jobject obj, - jint p0) { + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1475,16 +1489,16 @@ static jfloat Java_MotionEvent_getHistoricalSizeF_I(JNIEnv* env, jobject obj, jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalTouchMajorF_I = 0; static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I(JNIEnv* env, jobject - obj, jint p0) __attribute__ ((unused)); + obj, JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I(JNIEnv* env, jobject - obj, jint p0) { + obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1498,16 +1512,16 @@ static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalTouchMinorF_I = 0; static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I(JNIEnv* env, jobject - obj, jint p0) __attribute__ ((unused)); + obj, JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I(JNIEnv* env, jobject - obj, jint p0) { + obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1521,16 +1535,16 @@ static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalToolMajorF_I = 0; static jfloat Java_MotionEvent_getHistoricalToolMajorF_I(JNIEnv* env, jobject - obj, jint p0) __attribute__ ((unused)); + obj, JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalToolMajorF_I(JNIEnv* env, jobject - obj, jint p0) { + obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1544,16 +1558,16 @@ static jfloat Java_MotionEvent_getHistoricalToolMajorF_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalToolMinorF_I = 0; static jfloat Java_MotionEvent_getHistoricalToolMinorF_I(JNIEnv* env, jobject - obj, jint p0) __attribute__ ((unused)); + obj, JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalToolMinorF_I(JNIEnv* env, jobject - obj, jint p0) { + obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1567,16 +1581,16 @@ static jfloat Java_MotionEvent_getHistoricalToolMinorF_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalOrientationF_I = 0; static jfloat Java_MotionEvent_getHistoricalOrientationF_I(JNIEnv* env, jobject - obj, jint p0) __attribute__ ((unused)); + obj, JniIntWrapper p0) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalOrientationF_I(JNIEnv* env, jobject - obj, jint p0) { + obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1590,18 +1604,18 @@ static jfloat Java_MotionEvent_getHistoricalOrientationF_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalAxisValueF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) __attribute__ ((unused)); + obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) { + obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1615,18 +1629,18 @@ static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalXF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalXF_I_I(JNIEnv* env, jobject obj, - jint p0, - jint p1) __attribute__ ((unused)); + JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalXF_I_I(JNIEnv* env, jobject obj, - jint p0, - jint p1) { + JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1640,18 +1654,18 @@ static jfloat Java_MotionEvent_getHistoricalXF_I_I(JNIEnv* env, jobject obj, jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalYF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalYF_I_I(JNIEnv* env, jobject obj, - jint p0, - jint p1) __attribute__ ((unused)); + JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalYF_I_I(JNIEnv* env, jobject obj, - jint p0, - jint p1) { + JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1665,18 +1679,18 @@ static jfloat Java_MotionEvent_getHistoricalYF_I_I(JNIEnv* env, jobject obj, jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalPressureF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalPressureF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) __attribute__ ((unused)); + obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalPressureF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) { + obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1690,18 +1704,18 @@ static jfloat Java_MotionEvent_getHistoricalPressureF_I_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalSizeF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalSizeF_I_I(JNIEnv* env, jobject obj, - jint p0, - jint p1) __attribute__ ((unused)); + JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalSizeF_I_I(JNIEnv* env, jobject obj, - jint p0, - jint p1) { + JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1715,18 +1729,18 @@ static jfloat Java_MotionEvent_getHistoricalSizeF_I_I(JNIEnv* env, jobject obj, jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalTouchMajorF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) __attribute__ ((unused)); + obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) { + obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1740,18 +1754,18 @@ static jfloat Java_MotionEvent_getHistoricalTouchMajorF_I_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalTouchMinorF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) __attribute__ ((unused)); + obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) { + obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1765,18 +1779,18 @@ static jfloat Java_MotionEvent_getHistoricalTouchMinorF_I_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalToolMajorF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalToolMajorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) __attribute__ ((unused)); + obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalToolMajorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) { + obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1790,18 +1804,18 @@ static jfloat Java_MotionEvent_getHistoricalToolMajorF_I_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalToolMinorF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalToolMinorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) __attribute__ ((unused)); + obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalToolMinorF_I_I(JNIEnv* env, jobject - obj, jint p0, - jint p1) { + obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1815,18 +1829,18 @@ static jfloat Java_MotionEvent_getHistoricalToolMinorF_I_I(JNIEnv* env, jobject jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalOrientationF_I_I = 0; static jfloat Java_MotionEvent_getHistoricalOrientationF_I_I(JNIEnv* env, - jobject obj, jint p0, - jint p1) __attribute__ ((unused)); + jobject obj, JniIntWrapper p0, + JniIntWrapper p1) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalOrientationF_I_I(JNIEnv* env, - jobject obj, jint p0, - jint p1) { + jobject obj, JniIntWrapper p0, + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1840,20 +1854,20 @@ static jfloat Java_MotionEvent_getHistoricalOrientationF_I_I(JNIEnv* env, jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1); + method_id, as_jint(p0), as_jint(p1)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalAxisValueF_I_I_I = 0; static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I_I(JNIEnv* env, - jobject obj, jint p0, - jint p1, - jint p2) __attribute__ ((unused)); + jobject obj, JniIntWrapper p0, + JniIntWrapper p1, + JniIntWrapper p2) __attribute__ ((unused)); static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I_I(JNIEnv* env, - jobject obj, jint p0, - jint p1, - jint p2) { + jobject obj, JniIntWrapper p0, + JniIntWrapper p1, + JniIntWrapper p2) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz, 0); @@ -1867,19 +1881,19 @@ static jfloat Java_MotionEvent_getHistoricalAxisValueF_I_I_I(JNIEnv* env, jfloat ret = env->CallFloatMethod(obj, - method_id, p0, p1, p2); + method_id, as_jint(p0), as_jint(p1), as_jint(p2)); jni_generator::CheckException(env); return ret; } static base::subtle::AtomicWord g_MotionEvent_getHistoricalPointerCoords = 0; static void Java_MotionEvent_getHistoricalPointerCoords(JNIEnv* env, jobject - obj, jint p0, - jint p1, + obj, JniIntWrapper p0, + JniIntWrapper p1, jobject p2) __attribute__ ((unused)); static void Java_MotionEvent_getHistoricalPointerCoords(JNIEnv* env, jobject - obj, jint p0, - jint p1, + obj, JniIntWrapper p0, + JniIntWrapper p1, jobject p2) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, @@ -1893,7 +1907,7 @@ static void Java_MotionEvent_getHistoricalPointerCoords(JNIEnv* env, jobject &g_MotionEvent_getHistoricalPointerCoords); env->CallVoidMethod(obj, - method_id, p0, p1, p2); + method_id, as_jint(p0), as_jint(p1), p2); jni_generator::CheckException(env); } @@ -1921,9 +1935,10 @@ static jint Java_MotionEvent_getEdgeFlags(JNIEnv* env, jobject obj) { } static base::subtle::AtomicWord g_MotionEvent_setEdgeFlags = 0; -static void Java_MotionEvent_setEdgeFlags(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static void Java_MotionEvent_setEdgeFlags(JNIEnv* env, jobject obj, jint p0) { +static void Java_MotionEvent_setEdgeFlags(JNIEnv* env, jobject obj, + JniIntWrapper p0) __attribute__ ((unused)); +static void Java_MotionEvent_setEdgeFlags(JNIEnv* env, jobject obj, + JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz); @@ -1936,15 +1951,16 @@ static void Java_MotionEvent_setEdgeFlags(JNIEnv* env, jobject obj, jint p0) { &g_MotionEvent_setEdgeFlags); env->CallVoidMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); } static base::subtle::AtomicWord g_MotionEvent_setAction = 0; -static void Java_MotionEvent_setAction(JNIEnv* env, jobject obj, jint p0) - __attribute__ ((unused)); -static void Java_MotionEvent_setAction(JNIEnv* env, jobject obj, jint p0) { +static void Java_MotionEvent_setAction(JNIEnv* env, jobject obj, JniIntWrapper + p0) __attribute__ ((unused)); +static void Java_MotionEvent_setAction(JNIEnv* env, jobject obj, JniIntWrapper + p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz); @@ -1957,7 +1973,7 @@ static void Java_MotionEvent_setAction(JNIEnv* env, jobject obj, jint p0) { &g_MotionEvent_setAction); env->CallVoidMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); } @@ -2034,14 +2050,14 @@ static void Java_MotionEvent_addBatchV_J_F_F_F_F_I(JNIEnv* env, jobject obj, jfloat p2, jfloat p3, jfloat p4, - jint p5) __attribute__ ((unused)); + JniIntWrapper p5) __attribute__ ((unused)); static void Java_MotionEvent_addBatchV_J_F_F_F_F_I(JNIEnv* env, jobject obj, jlong p0, jfloat p1, jfloat p2, jfloat p3, jfloat p4, - jint p5) { + JniIntWrapper p5) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz); @@ -2054,7 +2070,7 @@ static void Java_MotionEvent_addBatchV_J_F_F_F_F_I(JNIEnv* env, jobject obj, &g_MotionEvent_addBatchV_J_F_F_F_F_I); env->CallVoidMethod(obj, - method_id, p0, p1, p2, p3, p4, p5); + method_id, p0, p1, p2, p3, p4, as_jint(p5)); jni_generator::CheckException(env); } @@ -2063,11 +2079,11 @@ static base::subtle::AtomicWord g_MotionEvent_addBatchV_J_LAVMEPC_I = 0; static void Java_MotionEvent_addBatchV_J_LAVMEPC_I(JNIEnv* env, jobject obj, jlong p0, jobjectArray p1, - jint p2) __attribute__ ((unused)); + JniIntWrapper p2) __attribute__ ((unused)); static void Java_MotionEvent_addBatchV_J_LAVMEPC_I(JNIEnv* env, jobject obj, jlong p0, jobjectArray p1, - jint p2) { + JniIntWrapper p2) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz); @@ -2080,7 +2096,7 @@ static void Java_MotionEvent_addBatchV_J_LAVMEPC_I(JNIEnv* env, jobject obj, &g_MotionEvent_addBatchV_J_LAVMEPC_I); env->CallVoidMethod(obj, - method_id, p0, p1, p2); + method_id, p0, p1, as_jint(p2)); jni_generator::CheckException(env); } @@ -2111,10 +2127,10 @@ static base::android::ScopedJavaLocalRef<jstring> static base::subtle::AtomicWord g_MotionEvent_actionToString = 0; static base::android::ScopedJavaLocalRef<jstring> - Java_MotionEvent_actionToString(JNIEnv* env, jint p0) __attribute__ + Java_MotionEvent_actionToString(JNIEnv* env, JniIntWrapper p0) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jstring> - Java_MotionEvent_actionToString(JNIEnv* env, jint p0) { + Java_MotionEvent_actionToString(JNIEnv* env, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -2128,17 +2144,17 @@ static base::android::ScopedJavaLocalRef<jstring> jstring ret = static_cast<jstring>(env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0)); + method_id, as_jint(p0))); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jstring>(env, ret); } static base::subtle::AtomicWord g_MotionEvent_axisToString = 0; static base::android::ScopedJavaLocalRef<jstring> - Java_MotionEvent_axisToString(JNIEnv* env, jint p0) __attribute__ + Java_MotionEvent_axisToString(JNIEnv* env, JniIntWrapper p0) __attribute__ ((unused)); static base::android::ScopedJavaLocalRef<jstring> - Java_MotionEvent_axisToString(JNIEnv* env, jint p0) { + Java_MotionEvent_axisToString(JNIEnv* env, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, g_MotionEvent_clazz, g_MotionEvent_clazz, NULL); @@ -2152,7 +2168,7 @@ static base::android::ScopedJavaLocalRef<jstring> jstring ret = static_cast<jstring>(env->CallStaticObjectMethod(g_MotionEvent_clazz, - method_id, p0)); + method_id, as_jint(p0))); jni_generator::CheckException(env); return base::android::ScopedJavaLocalRef<jstring>(env, ret); } @@ -2181,9 +2197,9 @@ static jint Java_MotionEvent_axisFromString(JNIEnv* env, jstring p0) { static base::subtle::AtomicWord g_MotionEvent_writeToParcel = 0; static void Java_MotionEvent_writeToParcel(JNIEnv* env, jobject obj, jobject p0, - jint p1) __attribute__ ((unused)); + JniIntWrapper p1) __attribute__ ((unused)); static void Java_MotionEvent_writeToParcel(JNIEnv* env, jobject obj, jobject p0, - jint p1) { + JniIntWrapper p1) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_MotionEvent_clazz); @@ -2196,7 +2212,7 @@ static void Java_MotionEvent_writeToParcel(JNIEnv* env, jobject obj, jobject p0, &g_MotionEvent_writeToParcel); env->CallVoidMethod(obj, - method_id, p0, p1); + method_id, p0, as_jint(p1)); jni_generator::CheckException(env); } diff --git a/base/android/jni_generator/testEagerCalledByNativesOption.golden b/base/android/jni_generator/testEagerCalledByNativesOption.golden index f57abeef50..4ff81ac516 100644 --- a/base/android/jni_generator/testEagerCalledByNativesOption.golden +++ b/base/android/jni_generator/testEagerCalledByNativesOption.golden @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestClassPath[] = "org/chromium/example/jni_generator/Test"; @@ -36,15 +38,16 @@ static jint Method(JNIEnv* env, jobject jcaller, namespace { -static void testMethodWithParam(JNIEnv* env, jobject obj, jint iParam) { +static void testMethodWithParam(JNIEnv* env, jobject obj, JniIntWrapper iParam) + { env->CallVoidMethod(obj, - g_Test_testMethodWithParam, iParam); + g_Test_testMethodWithParam, as_jint(iParam)); } -static jint testStaticMethodWithParam(JNIEnv* env, jint iParam) { +static jint testStaticMethodWithParam(JNIEnv* env, JniIntWrapper iParam) { jint ret = env->CallStaticIntMethod(g_Test_clazz, - g_Test_testStaticMethodWithParam, iParam); + g_Test_testStaticMethodWithParam, as_jint(iParam)); return ret; } diff --git a/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden index d30acb1641..34e2118431 100644 --- a/base/android/jni_generator/testFromJavaP.golden +++ b/base/android/jni_generator/testFromJavaP.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kInputStreamClassPath[] = "java/io/InputStream"; @@ -70,9 +72,9 @@ static void Java_InputStream_close(JNIEnv* env, jobject obj) { } static base::subtle::AtomicWord g_InputStream_mark = 0; -static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) +static void Java_InputStream_mark(JNIEnv* env, jobject obj, JniIntWrapper p0) __attribute__ ((unused)); -static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) { +static void Java_InputStream_mark(JNIEnv* env, jobject obj, JniIntWrapper p0) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_InputStream_clazz); @@ -85,7 +87,7 @@ static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) { &g_InputStream_mark); env->CallVoidMethod(obj, - method_id, p0); + method_id, as_jint(p0)); jni_generator::CheckException(env); } @@ -159,12 +161,12 @@ static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) { static base::subtle::AtomicWord g_InputStream_readI_AB_I_I = 0; static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray p0, - jint p1, - jint p2) __attribute__ ((unused)); + JniIntWrapper p1, + JniIntWrapper p2) __attribute__ ((unused)); static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray p0, - jint p1, - jint p2) { + JniIntWrapper p1, + JniIntWrapper p2) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, g_InputStream_clazz, 0); @@ -178,7 +180,7 @@ static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray jint ret = env->CallIntMethod(obj, - method_id, p0, p1, p2); + method_id, p0, as_jint(p1), as_jint(p2)); jni_generator::CheckException(env); return ret; } diff --git a/base/android/jni_generator/testFromJavaPGenerics.golden b/base/android/jni_generator/testFromJavaPGenerics.golden index 1ac340eed1..48582fdb21 100644 --- a/base/android/jni_generator/testFromJavaPGenerics.golden +++ b/base/android/jni_generator/testFromJavaPGenerics.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kHashSetClassPath[] = "java/util/HashSet"; diff --git a/base/android/jni_generator/testInnerClassNatives.golden b/base/android/jni_generator/testInnerClassNatives.golden index 2bc216126e..56a2e9b2ba 100644 --- a/base/android/jni_generator/testInnerClassNatives.golden +++ b/base/android/jni_generator/testInnerClassNatives.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestJniClassPath[] = "org/chromium/TestJni"; diff --git a/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden index 6b85ea9c7f..07b857f9a3 100644 --- a/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden +++ b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kMyOtherInnerClassClassPath[] = diff --git a/base/android/jni_generator/testInnerClassNativesMultiple.golden b/base/android/jni_generator/testInnerClassNativesMultiple.golden index 1341c89060..6a7f04d8bc 100644 --- a/base/android/jni_generator/testInnerClassNativesMultiple.golden +++ b/base/android/jni_generator/testInnerClassNativesMultiple.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kMyOtherInnerClassClassPath[] = diff --git a/base/android/jni_generator/testJNIInitNativeNameOption.golden b/base/android/jni_generator/testJNIInitNativeNameOption.golden index 54e7b281c0..0d5d3c6137 100644 --- a/base/android/jni_generator/testJNIInitNativeNameOption.golden +++ b/base/android/jni_generator/testJNIInitNativeNameOption.golden @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestClassPath[] = "org/chromium/example/jni_generator/Test"; diff --git a/base/android/jni_generator/testJarJarRemapping.golden b/base/android/jni_generator/testJarJarRemapping.golden index 26406e4bb5..a4911d0048 100644 --- a/base/android/jni_generator/testJarJarRemapping.golden +++ b/base/android/jni_generator/testJarJarRemapping.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kExampleClassPath[] = "com/test/jni_generator/Example"; diff --git a/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden index de109e703d..db69a5aaa6 100644 --- a/base/android/jni_generator/testNatives.golden +++ b/base/android/jni_generator/testNatives.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestJniClassPath[] = "org/chromium/TestJni"; diff --git a/base/android/jni_generator/testNativesLong.golden b/base/android/jni_generator/testNativesLong.golden index 24d4a15074..25b5fadf0d 100644 --- a/base/android/jni_generator/testNativesLong.golden +++ b/base/android/jni_generator/testNativesLong.golden @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestJniClassPath[] = "org/chromium/TestJni"; diff --git a/base/android/jni_generator/testPureNativeMethodsOption.golden b/base/android/jni_generator/testPureNativeMethodsOption.golden index e7f8d53dd4..8d9ee9e26f 100644 --- a/base/android/jni_generator/testPureNativeMethodsOption.golden +++ b/base/android/jni_generator/testPureNativeMethodsOption.golden @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,8 @@ #include "base/android/jni_generator/jni_generator_helper.h" +#include "base/android/jni_int_wrapper.h" + // Step 1: forward declarations. namespace { const char kTestClassPath[] = "org/chromium/example/jni_generator/Test"; diff --git a/base/android/jni_int_wrapper.h b/base/android/jni_int_wrapper.h new file mode 100644 index 0000000000..fa0f3d5d54 --- /dev/null +++ b/base/android/jni_int_wrapper.h @@ -0,0 +1,56 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_ANDROID_JNI_INT_WRAPPER_H_ +#define BASE_ANDROID_JNI_INT_WRAPPER_H_ + +// Wrapper used to receive int when calling Java from native. +// The wrapper disallows automatic conversion of long to int. +// This is to avoid a common anti-pattern where a Java int is used +// to receive a native pointer. Please use a Java long to receive +// native pointers, so that the code works on both 32-bit and 64-bit +// platforms. Note the wrapper allows other lossy conversions into +// jint that could be consider anti-patterns, such as from size_t. + +// Checking is only done in debugging builds. + +#ifdef NDEBUG + +typedef jint JniIntWrapper; + +// This inline is sufficiently trivial that it does not change the +// final code generated by g++. +inline jint as_jint(JniIntWrapper wrapper) { + return wrapper; +} + +#else + +class JniIntWrapper { + public: + JniIntWrapper() : i_(0) {} + JniIntWrapper(int i) : i_(i) {} + JniIntWrapper(const JniIntWrapper& ji) : i_(ji.i_) {} + template <class T> JniIntWrapper(const T& t) : i_(t) {} + jint as_jint() const { return i_; } + private: + // If you get an "is private" error at the line below it is because you used + // an implicit conversion to convert a long to an int when calling Java. + // We disallow this, as a common anti-pattern allows converting a native + // pointer (intptr_t) to a Java int. Please use a Java long to represent + // a native pointer. If you want a lossy conversion, please use an + // explicit conversion in your C++ code. Note an error is only seen when + // compiling on a 64-bit platform, as intptr_t is indistinguishable from + // int on 32-bit platforms. + JniIntWrapper(long); + jint i_; +}; + +inline jint as_jint(const JniIntWrapper& wrapper) { + return wrapper.as_jint(); +} + +#endif // NDEBUG + +#endif // BASE_ANDROID_JNI_INT_WRAPPER_H_ diff --git a/base/android/library_loader/library_loader_hooks.cc b/base/android/library_loader/library_loader_hooks.cc index 0145eabe1e..79470108eb 100644 --- a/base/android/library_loader/library_loader_hooks.cc +++ b/base/android/library_loader/library_loader_hooks.cc @@ -4,6 +4,7 @@ #include "base/android/library_loader/library_loader_hooks.h" +#include "base/android/jni_string.h" #include "base/at_exit.h" #include "base/metrics/histogram.h" #include "jni/LibraryLoader_jni.h" @@ -61,7 +62,7 @@ void SetVersionNumber(const char* version_number) { } jstring GetVersionNumber(JNIEnv* env, jclass clazz) { - return env->NewStringUTF(g_library_version_number); + return ConvertUTF8ToJavaString(env, g_library_version_number).Release(); } static void RecordNativeLibraryHack(JNIEnv*, jclass, jboolean usedHack) { diff --git a/base/atomicops_internals_arm_gcc.h b/base/atomicops_internals_arm_gcc.h index 7c3d51dca9..e654afa7d2 100644 --- a/base/atomicops_internals_arm_gcc.h +++ b/base/atomicops_internals_arm_gcc.h @@ -63,7 +63,7 @@ inline void MemoryBarrier() { defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \ defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \ - defined(__ARM_ARCH_6KZ__) || defined(__ARM_ARCH_6T2__) + defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, Atomic32 old_value, diff --git a/base/base.gyp b/base/base.gyp index 06ad10bfb3..85f0a947db 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -143,8 +143,7 @@ ], }, 'conditions': [ - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)', { + ['use_allocator!="tcmalloc"', { 'defines': [ 'NO_TCMALLOC', ], @@ -700,8 +699,7 @@ 'message_loop/message_pump_glib_unittest.cc', ] }], - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 - ['OS == "linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { + ['OS == "linux" and use_allocator!="none"', { 'dependencies': [ 'allocator/allocator.gyp:allocator', ], @@ -978,8 +976,7 @@ 'conditions': [ ['use_custom_libcxx==1', { 'dependencies!': [ - '../third_party/libc++/libc++.gyp:libc++', - '../third_party/libc++abi/libc++abi.gyp:libc++abi', + '../third_party/libc++/libc++.gyp:libcxx_proxy', ], }], ], diff --git a/base/base.gypi b/base/base.gypi index 8110287395..520f56717b 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -125,7 +125,7 @@ 'cpu.cc', 'cpu.h', 'critical_closure.h', - 'critical_closure_ios.mm', + 'critical_closure_internal_ios.mm', 'debug/alias.cc', 'debug/alias.h', 'debug/crash_logging.cc', @@ -137,7 +137,7 @@ 'debug/dump_without_crashing.cc', 'debug/dump_without_crashing.h', 'debug/gdi_debug_util_win.cc', - 'debug/gdi_debug_util_win.h', + 'debug/gdi_debug_util_win.h', # This file depends on files from the 'allocator' target, # but this target does not depend on 'allocator' (see # allocator.gyp for details). @@ -274,6 +274,8 @@ 'mac/mac_logging.cc', 'mac/mac_util.h', 'mac/mac_util.mm', + 'mac/mach_logging.cc', + 'mac/mach_logging.h', 'mac/objc_property_releaser.h', 'mac/objc_property_releaser.mm', 'mac/os_crash_dumps.cc', @@ -287,6 +289,8 @@ 'mac/scoped_launch_data.h', 'mac/scoped_mach_port.cc', 'mac/scoped_mach_port.h', + 'mac/scoped_mach_vm.cc', + 'mac/scoped_mach_vm.h', 'mac/scoped_nsautorelease_pool.h', 'mac/scoped_nsautorelease_pool.mm', 'mac/scoped_nsexception_enabler.h', diff --git a/base/base.target.darwin-arm.mk b/base/base.target.darwin-arm.mk index 90bc61609b..c80bf7aea5 100644 --- a/base/base.target.darwin-arm.mk +++ b/base/base.target.darwin-arm.mk @@ -276,7 +276,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -365,7 +364,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base.target.darwin-x86.mk b/base/base.target.darwin-x86.mk index 47c6b40178..2a5f236665 100644 --- a/base/base.target.darwin-x86.mk +++ b/base/base.target.darwin-x86.mk @@ -279,7 +279,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -368,7 +367,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base.target.darwin-x86_64.mk b/base/base.target.darwin-x86_64.mk index edcc5abcdd..b21af617ee 100644 --- a/base/base.target.darwin-x86_64.mk +++ b/base/base.target.darwin-x86_64.mk @@ -279,7 +279,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -368,7 +367,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base.target.linux-arm.mk b/base/base.target.linux-arm.mk index 90bc61609b..c80bf7aea5 100644 --- a/base/base.target.linux-arm.mk +++ b/base/base.target.linux-arm.mk @@ -276,7 +276,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -365,7 +364,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base.target.linux-x86.mk b/base/base.target.linux-x86.mk index 47c6b40178..2a5f236665 100644 --- a/base/base.target.linux-x86.mk +++ b/base/base.target.linux-x86.mk @@ -279,7 +279,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -368,7 +367,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base.target.linux-x86_64.mk b/base/base.target.linux-x86_64.mk index edcc5abcdd..b21af617ee 100644 --- a/base/base.target.linux-x86_64.mk +++ b/base/base.target.linux-x86_64.mk @@ -279,7 +279,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -368,7 +367,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_i18n.target.darwin-arm.mk b/base/base_i18n.target.darwin-arm.mk index 11665f0ba7..9bfad4eabf 100644 --- a/base/base_i18n.target.darwin-arm.mk +++ b/base/base_i18n.target.darwin-arm.mk @@ -59,7 +59,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -152,7 +151,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_i18n.target.darwin-x86.mk b/base/base_i18n.target.darwin-x86.mk index 3d5883bc56..dc6b9c97a2 100644 --- a/base/base_i18n.target.darwin-x86.mk +++ b/base/base_i18n.target.darwin-x86.mk @@ -61,7 +61,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -154,7 +153,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_i18n.target.darwin-x86_64.mk b/base/base_i18n.target.darwin-x86_64.mk index 7419913dce..ee2b64d2fb 100644 --- a/base/base_i18n.target.darwin-x86_64.mk +++ b/base/base_i18n.target.darwin-x86_64.mk @@ -61,7 +61,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -154,7 +153,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_i18n.target.linux-arm.mk b/base/base_i18n.target.linux-arm.mk index 11665f0ba7..9bfad4eabf 100644 --- a/base/base_i18n.target.linux-arm.mk +++ b/base/base_i18n.target.linux-arm.mk @@ -59,7 +59,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -152,7 +151,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_i18n.target.linux-x86.mk b/base/base_i18n.target.linux-x86.mk index 3d5883bc56..dc6b9c97a2 100644 --- a/base/base_i18n.target.linux-x86.mk +++ b/base/base_i18n.target.linux-x86.mk @@ -61,7 +61,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -154,7 +153,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_i18n.target.linux-x86_64.mk b/base/base_i18n.target.linux-x86_64.mk index 7419913dce..ee2b64d2fb 100644 --- a/base/base_i18n.target.linux-x86_64.mk +++ b/base/base_i18n.target.linux-x86_64.mk @@ -61,7 +61,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -154,7 +153,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_application_state.target.darwin-arm.mk b/base/base_java_application_state.target.darwin-arm.mk index 4c483f4495..e4d7ecc526 100644 --- a/base/base_java_application_state.target.darwin-arm.mk +++ b/base/base_java_application_state.target.darwin-arm.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -53,7 +54,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -137,7 +137,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_java_application_state.target.darwin-arm64.mk b/base/base_java_application_state.target.darwin-arm64.mk index 1b8db0400a..e3f7511699 100644 --- a/base/base_java_application_state.target.darwin-arm64.mk +++ b/base/base_java_application_state.target.darwin-arm64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_application_state.target.darwin-mips.mk b/base/base_java_application_state.target.darwin-mips.mk index b5bf77970e..a0dafc7381 100644 --- a/base/base_java_application_state.target.darwin-mips.mk +++ b/base/base_java_application_state.target.darwin-mips.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_application_state.target.darwin-x86.mk b/base/base_java_application_state.target.darwin-x86.mk index 47285e7f35..22d82813b2 100644 --- a/base/base_java_application_state.target.darwin-x86.mk +++ b/base/base_java_application_state.target.darwin-x86.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_application_state.target.darwin-x86_64.mk b/base/base_java_application_state.target.darwin-x86_64.mk index cd8325ab3e..2df4e8f090 100644 --- a/base/base_java_application_state.target.darwin-x86_64.mk +++ b/base/base_java_application_state.target.darwin-x86_64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_application_state.target.linux-arm.mk b/base/base_java_application_state.target.linux-arm.mk index 4c483f4495..e4d7ecc526 100644 --- a/base/base_java_application_state.target.linux-arm.mk +++ b/base/base_java_application_state.target.linux-arm.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -53,7 +54,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -137,7 +137,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_java_application_state.target.linux-arm64.mk b/base/base_java_application_state.target.linux-arm64.mk index 1b8db0400a..e3f7511699 100644 --- a/base/base_java_application_state.target.linux-arm64.mk +++ b/base/base_java_application_state.target.linux-arm64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_application_state.target.linux-mips.mk b/base/base_java_application_state.target.linux-mips.mk index b5bf77970e..a0dafc7381 100644 --- a/base/base_java_application_state.target.linux-mips.mk +++ b/base/base_java_application_state.target.linux-mips.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_application_state.target.linux-x86.mk b/base/base_java_application_state.target.linux-x86.mk index 47285e7f35..22d82813b2 100644 --- a/base/base_java_application_state.target.linux-x86.mk +++ b/base/base_java_application_state.target.linux-x86.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_application_state.target.linux-x86_64.mk b/base/base_java_application_state.target.linux-x86_64.mk index cd8325ab3e..2df4e8f090 100644 --- a/base/base_java_application_state.target.linux-x86_64.mk +++ b/base/base_java_application_state.target.linux-x86_64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_application_state_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'android/application_state_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationState.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/ApplicationState.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_memory_pressure_level_list.target.darwin-arm.mk b/base/base_java_memory_pressure_level_list.target.darwin-arm.mk index 03af96e0a9..858c47ac69 100644 --- a/base/base_java_memory_pressure_level_list.target.darwin-arm.mk +++ b/base/base_java_memory_pressure_level_list.target.darwin-arm.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -53,7 +54,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -137,7 +137,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_java_memory_pressure_level_list.target.darwin-arm64.mk b/base/base_java_memory_pressure_level_list.target.darwin-arm64.mk index a1b25346d3..d2cfa526cd 100644 --- a/base/base_java_memory_pressure_level_list.target.darwin-arm64.mk +++ b/base/base_java_memory_pressure_level_list.target.darwin-arm64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_memory_pressure_level_list.target.darwin-mips.mk b/base/base_java_memory_pressure_level_list.target.darwin-mips.mk index cc83c53999..4b409e04e5 100644 --- a/base/base_java_memory_pressure_level_list.target.darwin-mips.mk +++ b/base/base_java_memory_pressure_level_list.target.darwin-mips.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_memory_pressure_level_list.target.darwin-x86.mk b/base/base_java_memory_pressure_level_list.target.darwin-x86.mk index a9cb80e5f8..e628622a83 100644 --- a/base/base_java_memory_pressure_level_list.target.darwin-x86.mk +++ b/base/base_java_memory_pressure_level_list.target.darwin-x86.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_memory_pressure_level_list.target.darwin-x86_64.mk b/base/base_java_memory_pressure_level_list.target.darwin-x86_64.mk index b89da55737..597fbde217 100644 --- a/base/base_java_memory_pressure_level_list.target.darwin-x86_64.mk +++ b/base/base_java_memory_pressure_level_list.target.darwin-x86_64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_memory_pressure_level_list.target.linux-arm.mk b/base/base_java_memory_pressure_level_list.target.linux-arm.mk index 03af96e0a9..858c47ac69 100644 --- a/base/base_java_memory_pressure_level_list.target.linux-arm.mk +++ b/base/base_java_memory_pressure_level_list.target.linux-arm.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -53,7 +54,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -137,7 +137,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_java_memory_pressure_level_list.target.linux-arm64.mk b/base/base_java_memory_pressure_level_list.target.linux-arm64.mk index a1b25346d3..d2cfa526cd 100644 --- a/base/base_java_memory_pressure_level_list.target.linux-arm64.mk +++ b/base/base_java_memory_pressure_level_list.target.linux-arm64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_memory_pressure_level_list.target.linux-mips.mk b/base/base_java_memory_pressure_level_list.target.linux-mips.mk index cc83c53999..4b409e04e5 100644 --- a/base/base_java_memory_pressure_level_list.target.linux-mips.mk +++ b/base/base_java_memory_pressure_level_list.target.linux-mips.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_java_memory_pressure_level_list.target.linux-x86.mk b/base/base_java_memory_pressure_level_list.target.linux-x86.mk index a9cb80e5f8..e628622a83 100644 --- a/base/base_java_memory_pressure_level_list.target.linux-x86.mk +++ b/base/base_java_memory_pressure_level_list.target.linux-x86.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_java_memory_pressure_level_list.target.linux-x86_64.mk b/base/base_java_memory_pressure_level_list.target.linux-x86_64.mk index b89da55737..597fbde217 100644 --- a/base/base_java_memory_pressure_level_list.target.linux-x86_64.mk +++ b/base/base_java_memory_pressure_level_list.target.linux-x86_64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_java_memory_pressure_level_list_target_generate_java_constants": # "{'inputs': ['../build/android/gyp/util/build_utils.py', '../build/android/gyp/gcc_preprocess.py', 'memory/memory_pressure_level_list.h'], 'extension': 'template', 'outputs': ['$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'], 'variables': {'output_path': '$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java'}, 'rule_name': 'generate_java_constants', 'rule_sources': ['android/java/src/org/chromium/base/MemoryPressureLevelList.template'], 'action': ['python', '../build/android/gyp/gcc_preprocess.py', '--include-path=..', '--output=$(gyp_shared_intermediate_dir)/templates/org/chromium/base/%(INPUT_ROOT)s.java', '--template=$(RULE_SOURCES)'], 'message': 'Generating Java from cpp template $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/templates/org/chromium/base/MemoryPressureLevelList.java: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -55,7 +56,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -139,7 +139,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_jni_headers.target.darwin-arm.mk b/base/base_jni_headers.target.darwin-arm.mk index f8e84fe4aa..b1521df0cc 100644 --- a/base/base_jni_headers.target.darwin-arm.mk +++ b/base/base_jni_headers.target.darwin-arm.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -204,7 +220,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -288,7 +303,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_jni_headers.target.darwin-arm64.mk b/base/base_jni_headers.target.darwin-arm64.mk index 362cc8bb48..c32bdb4996 100644 --- a/base/base_jni_headers.target.darwin-arm64.mk +++ b/base/base_jni_headers.target.darwin-arm64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_jni_headers.target.darwin-mips.mk b/base/base_jni_headers.target.darwin-mips.mk index 0c716c2d60..64da039ea2 100644 --- a/base/base_jni_headers.target.darwin-mips.mk +++ b/base/base_jni_headers.target.darwin-mips.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_jni_headers.target.darwin-x86.mk b/base/base_jni_headers.target.darwin-x86.mk index 608de6c60c..0fd7ec1a5c 100644 --- a/base/base_jni_headers.target.darwin-x86.mk +++ b/base/base_jni_headers.target.darwin-x86.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -206,7 +222,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -290,7 +305,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_jni_headers.target.darwin-x86_64.mk b/base/base_jni_headers.target.darwin-x86_64.mk index 542bb1db5d..69b0e428d0 100644 --- a/base/base_jni_headers.target.darwin-x86_64.mk +++ b/base/base_jni_headers.target.darwin-x86_64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -206,7 +222,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -290,7 +305,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_jni_headers.target.linux-arm.mk b/base/base_jni_headers.target.linux-arm.mk index f8e84fe4aa..b1521df0cc 100644 --- a/base/base_jni_headers.target.linux-arm.mk +++ b/base/base_jni_headers.target.linux-arm.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -204,7 +220,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -288,7 +303,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_jni_headers.target.linux-arm64.mk b/base/base_jni_headers.target.linux-arm64.mk index 362cc8bb48..c32bdb4996 100644 --- a/base/base_jni_headers.target.linux-arm64.mk +++ b/base/base_jni_headers.target.linux-arm64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_jni_headers.target.linux-mips.mk b/base/base_jni_headers.target.linux-mips.mk index 0c716c2d60..64da039ea2 100644 --- a/base/base_jni_headers.target.linux-mips.mk +++ b/base/base_jni_headers.target.linux-mips.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) diff --git a/base/base_jni_headers.target.linux-x86.mk b/base/base_jni_headers.target.linux-x86.mk index 608de6c60c..0fd7ec1a5c 100644 --- a/base/base_jni_headers.target.linux-x86.mk +++ b/base/base_jni_headers.target.linux-x86.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -206,7 +222,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -290,7 +305,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_jni_headers.target.linux-x86_64.mk b/base/base_jni_headers.target.linux-x86_64.mk index 542bb1db5d..69b0e428d0 100644 --- a/base/base_jni_headers.target.linux-x86_64.mk +++ b/base/base_jni_headers.target.linux-x86_64.mk @@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "base_base_gyp_base_jni_headers_target_generate_jni_headers": # "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/base/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['android/java/src/org/chromium/base/ApplicationStatus.java', 'android/java/src/org/chromium/base/BuildInfo.java', 'android/java/src/org/chromium/base/CommandLine.java', 'android/java/src/org/chromium/base/ContentUriUtils.java', 'android/java/src/org/chromium/base/CpuFeatures.java', 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java', 'android/java/src/org/chromium/base/library_loader/LibraryLoader.java', 'android/java/src/org/chromium/base/MemoryPressureListener.java', 'android/java/src/org/chromium/base/JavaHandlerThread.java', 'android/java/src/org/chromium/base/PathService.java', 'android/java/src/org/chromium/base/PathUtils.java', 'android/java/src/org/chromium/base/PowerMonitor.java', 'android/java/src/org/chromium/base/SystemMessageHandler.java', 'android/java/src/org/chromium/base/SysUtils.java', 'android/java/src/org/chromium/base/ThreadUtils.java', 'android/java/src/org/chromium/base/TraceEvent.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/base/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -26,6 +27,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ApplicationStatus_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -34,6 +36,7 @@ $(gyp_shared_intermediate_dir)/base/jni/BuildInfo_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -42,6 +45,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CommandLine_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -50,6 +54,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ContentUriUtils_jni.h: $(LOCAL_PATH)/bas $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -58,6 +63,7 @@ $(gyp_shared_intermediate_dir)/base/jni/CpuFeatures_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -66,6 +72,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ImportantFileWriterAndroid_jni.h: $(LOCA $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -74,6 +81,7 @@ $(gyp_shared_intermediate_dir)/base/jni/LibraryLoader_jni.h: $(LOCAL_PATH)/base/ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -82,6 +90,7 @@ $(gyp_shared_intermediate_dir)/base/jni/MemoryPressureListener_jni.h: $(LOCAL_PA $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -90,6 +99,7 @@ $(gyp_shared_intermediate_dir)/base/jni/JavaHandlerThread_jni.h: $(LOCAL_PATH)/b $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -98,6 +108,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathService_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -106,6 +117,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PathUtils_jni.h: $(LOCAL_PATH)/base/andr $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -114,6 +126,7 @@ $(gyp_shared_intermediate_dir)/base/jni/PowerMonitor_jni.h: $(LOCAL_PATH)/base/a $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -122,6 +135,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SystemMessageHandler_jni.h: $(LOCAL_PATH $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -130,6 +144,7 @@ $(gyp_shared_intermediate_dir)/base/jni/SysUtils_jni.h: $(LOCAL_PATH)/base/andro $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -138,6 +153,7 @@ $(gyp_shared_intermediate_dir)/base/jni/ThreadUtils_jni.h: $(LOCAL_PATH)/base/an $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/base/jni/TraceEvent_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) @@ -206,7 +222,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -290,7 +305,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_prefs.target.darwin-arm.mk b/base/base_prefs.target.darwin-arm.mk index bb7285db6c..4ac88b7831 100644 --- a/base/base_prefs.target.darwin-arm.mk +++ b/base/base_prefs.target.darwin-arm.mk @@ -55,7 +55,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -142,7 +141,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_prefs.target.darwin-x86.mk b/base/base_prefs.target.darwin-x86.mk index 229b7d257f..5c9ad5d942 100644 --- a/base/base_prefs.target.darwin-x86.mk +++ b/base/base_prefs.target.darwin-x86.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -144,7 +143,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_prefs.target.darwin-x86_64.mk b/base/base_prefs.target.darwin-x86_64.mk index 42373683c6..4f343638f7 100644 --- a/base/base_prefs.target.darwin-x86_64.mk +++ b/base/base_prefs.target.darwin-x86_64.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -144,7 +143,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_prefs.target.linux-arm.mk b/base/base_prefs.target.linux-arm.mk index bb7285db6c..4ac88b7831 100644 --- a/base/base_prefs.target.linux-arm.mk +++ b/base/base_prefs.target.linux-arm.mk @@ -55,7 +55,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -142,7 +141,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_prefs.target.linux-x86.mk b/base/base_prefs.target.linux-x86.mk index 229b7d257f..5c9ad5d942 100644 --- a/base/base_prefs.target.linux-x86.mk +++ b/base/base_prefs.target.linux-x86.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -144,7 +143,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_prefs.target.linux-x86_64.mk b/base/base_prefs.target.linux-x86_64.mk index 42373683c6..4f343638f7 100644 --- a/base/base_prefs.target.linux-x86_64.mk +++ b/base/base_prefs.target.linux-x86_64.mk @@ -57,7 +57,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -144,7 +143,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_static.target.darwin-arm.mk b/base/base_static.target.darwin-arm.mk index 6e99300990..aa884e3cfc 100644 --- a/base/base_static.target.darwin-arm.mk +++ b/base/base_static.target.darwin-arm.mk @@ -41,7 +41,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -126,7 +125,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_static.target.darwin-x86.mk b/base/base_static.target.darwin-x86.mk index 4cc7fc2766..75cee9c1f8 100644 --- a/base/base_static.target.darwin-x86.mk +++ b/base/base_static.target.darwin-x86.mk @@ -43,7 +43,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_static.target.darwin-x86_64.mk b/base/base_static.target.darwin-x86_64.mk index db95a24b8b..1aeda9ffa1 100644 --- a/base/base_static.target.darwin-x86_64.mk +++ b/base/base_static.target.darwin-x86_64.mk @@ -43,7 +43,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_static.target.linux-arm.mk b/base/base_static.target.linux-arm.mk index 6e99300990..aa884e3cfc 100644 --- a/base/base_static.target.linux-arm.mk +++ b/base/base_static.target.linux-arm.mk @@ -41,7 +41,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -126,7 +125,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/base_static.target.linux-x86.mk b/base/base_static.target.linux-x86.mk index 4cc7fc2766..75cee9c1f8 100644 --- a/base/base_static.target.linux-x86.mk +++ b/base/base_static.target.linux-x86.mk @@ -43,7 +43,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/base_static.target.linux-x86_64.mk b/base/base_static.target.linux-x86_64.mk index db95a24b8b..1aeda9ffa1 100644 --- a/base/base_static.target.linux-x86_64.mk +++ b/base/base_static.target.linux-x86_64.mk @@ -43,7 +43,6 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/cpu.cc b/base/cpu.cc index 3fa94130d4..f18b8db244 100644 --- a/base/cpu.cc +++ b/base/cpu.cc @@ -91,21 +91,28 @@ uint64 _xgetbv(uint32 xcr) { #if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) +// Returns the string found in /proc/cpuinfo under the key "model name" or +// "Processor". "model name" is used in Linux 3.8 and later (3.7 and later for +// arm64) and is shown once per CPU. "Processor" is used in earler versions and +// is shown only once at the top of /proc/cpuinfo regardless of the number CPUs. std::string ParseCpuInfo() { - const char kProcessorPrefix[] = "Processor"; - std::string contents, cpu_brand; + const char kModelNamePrefix[] = "model name\t: "; + const char kProcessorPrefix[] = "Processor\t: "; + std::string contents; ReadFileToString(FilePath("/proc/cpuinfo"), &contents); DCHECK(!contents.empty()); + std::string cpu_brand; if (!contents.empty()) { std::istringstream iss(contents); std::string line; while (std::getline(iss, line)) { + if (line.compare(0, strlen(kModelNamePrefix), kModelNamePrefix) == 0) { + cpu_brand.assign(line.substr(strlen(kModelNamePrefix))); + break; + } if (line.compare(0, strlen(kProcessorPrefix), kProcessorPrefix) == 0) { - size_t pos = line.find(": "); - if (pos != std::string::npos) { - cpu_brand.assign(line.substr(pos + 2)); - break; - } + cpu_brand.assign(line.substr(strlen(kProcessorPrefix))); + break; } } } diff --git a/base/critical_closure.h b/base/critical_closure.h index ca51ed5cef..ac07911089 100644 --- a/base/critical_closure.h +++ b/base/critical_closure.h @@ -7,9 +7,46 @@ #include "base/callback.h" +#if defined(OS_IOS) +#include "base/bind.h" +#include "base/ios/scoped_critical_action.h" +#endif + namespace base { -// Returns a closure that will continue to run for a period of time when the +namespace internal { + +#if defined(OS_IOS) +// Returns true if multi-tasking is supported on this iOS device. +bool IsMultiTaskingSupported(); + +// This class wraps a closure so it can continue to run for a period of time +// when the application goes to the background by using +// |ios::ScopedCriticalAction|. +template <typename R> +class CriticalClosure { + public: + explicit CriticalClosure(const Callback<R(void)>& closure) + : closure_(closure) {} + + ~CriticalClosure() {} + + R Run() { + return closure_.Run(); + } + + private: + ios::ScopedCriticalAction critical_action_; + Callback<R(void)> closure_; + + DISALLOW_COPY_AND_ASSIGN(CriticalClosure); +}; +#endif // defined(OS_IOS) + +} // namespace internal + +// Returns a closure (which may return a result, but must not require any extra +// arguments) that will continue to run for a period of time when the // application goes to the background if possible on platforms where // applications don't execute while backgrounded, otherwise the original task is // returned. @@ -23,14 +60,20 @@ namespace base { // background running time, |MakeCriticalClosure| should be applied on them // before posting. #if defined(OS_IOS) -base::Closure MakeCriticalClosure(const base::Closure& closure); -#else -inline base::Closure MakeCriticalClosure(const base::Closure& closure) { +template <typename R> +Callback<R(void)> MakeCriticalClosure(const Callback<R(void)>& closure) { + DCHECK(internal::IsMultiTaskingSupported()); + return base::Bind(&internal::CriticalClosure<R>::Run, + Owned(new internal::CriticalClosure<R>(closure))); +} +#else // defined(OS_IOS) +template <typename R> +inline Callback<R(void)> MakeCriticalClosure(const Callback<R(void)>& closure) { // No-op for platforms where the application does not need to acquire // background time for closures to finish when it goes into the background. return closure; } -#endif // !defined(OS_IOS) +#endif // defined(OS_IOS) } // namespace base diff --git a/base/critical_closure_internal_ios.mm b/base/critical_closure_internal_ios.mm new file mode 100644 index 0000000000..b8fec141b2 --- /dev/null +++ b/base/critical_closure_internal_ios.mm @@ -0,0 +1,17 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/critical_closure.h" + +#import <UIKit/UIKit.h> + +namespace base { +namespace internal { + +bool IsMultiTaskingSupported() { + return [[UIDevice currentDevice] isMultitaskingSupported]; +} + +} // namespace internal +} // namespace base diff --git a/base/critical_closure_ios.mm b/base/critical_closure_ios.mm deleted file mode 100644 index d605cad0a2..0000000000 --- a/base/critical_closure_ios.mm +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/critical_closure.h" - -#import <UIKit/UIKit.h> - -#include "base/bind.h" -#include "base/ios/scoped_critical_action.h" -#include "base/memory/ref_counted.h" - -namespace { - -// This class wraps a closure so it can continue to run for a period of time -// when the application goes to the background by using -// |base::ios::ScopedCriticalAction|. -class CriticalClosure : public base::RefCountedThreadSafe<CriticalClosure> { - public: - explicit CriticalClosure(base::Closure* closure) : closure_(closure) { - } - - void Run() { - closure_->Run(); - } - - private: - friend class base::RefCountedThreadSafe<CriticalClosure>; - - virtual ~CriticalClosure() {} - - base::ios::ScopedCriticalAction criticial_action_; - scoped_ptr<base::Closure> closure_; - - DISALLOW_COPY_AND_ASSIGN(CriticalClosure); -}; - -} // namespace - -namespace base { - -base::Closure MakeCriticalClosure(const base::Closure& closure) { - DCHECK([[UIDevice currentDevice] isMultitaskingSupported]); - scoped_refptr<CriticalClosure> critical_closure( - new CriticalClosure(new base::Closure(closure))); - return base::Bind(&CriticalClosure::Run, critical_closure.get()); -} - -} // namespace base diff --git a/base/debug/sanitizer_options.cc b/base/debug/sanitizer_options.cc index e72f371b3e..41f82b9840 100644 --- a/base/debug/sanitizer_options.cc +++ b/base/debug/sanitizer_options.cc @@ -45,11 +45,12 @@ void _sanitizer_options_link_helper() { } // Chromium builds. const char kAsanDefaultOptions[] = "legacy_pthread_cond=1 malloc_context_size=5 strict_memcmp=0 " - "symbolize=false check_printf=1 use_sigaltstack=1"; + "symbolize=false check_printf=1 use_sigaltstack=1 detect_leaks=0"; #else // Default AddressSanitizer options for buildbots and non-official builds. const char *kAsanDefaultOptions = - "strict_memcmp=0 symbolize=false check_printf=1 use_sigaltstack=1"; + "strict_memcmp=0 symbolize=false check_printf=1 use_sigaltstack=1 " + "detect_leaks=0"; #endif // GOOGLE_CHROME_BUILD #elif defined(OS_MACOSX) @@ -60,6 +61,10 @@ const char *kAsanDefaultOptions = #if defined(OS_LINUX) || defined(OS_MACOSX) extern "C" __attribute__((no_sanitize_address)) +__attribute__((visibility("default"))) +// The function isn't referenced from the executable itself. Make sure it isn't +// stripped by the linker. +__attribute__((used)) const char *__asan_default_options() { return kAsanDefaultOptions; } diff --git a/base/debug/stack_trace.h b/base/debug/stack_trace.h index e6887e605f..7c2ac3cb87 100644 --- a/base/debug/stack_trace.h +++ b/base/debug/stack_trace.h @@ -53,7 +53,7 @@ class BASE_EXPORT StackTrace { // Creates a stacktrace for an exception. // Note: this function will throw an import not found (StackWalk64) exception // on system without dbghelp 5.1. - StackTrace(_EXCEPTION_POINTERS* exception_pointers); + StackTrace(const _EXCEPTION_POINTERS* exception_pointers); #endif // Copying and assignment are allowed with the default functions. diff --git a/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc index eb35b6ab91..a3327afcea 100644 --- a/base/debug/stack_trace_win.cc +++ b/base/debug/stack_trace_win.cc @@ -211,22 +211,25 @@ StackTrace::StackTrace() { #pragma optimize("", on) #endif -StackTrace::StackTrace(EXCEPTION_POINTERS* exception_pointers) { +StackTrace::StackTrace(const EXCEPTION_POINTERS* exception_pointers) { // When walking an exception stack, we need to use StackWalk64(). count_ = 0; + // StackWalk64() may modify context record passed to it, so we will + // use a copy. + CONTEXT context_record = *exception_pointers->ContextRecord; // Initialize stack walking. STACKFRAME64 stack_frame; memset(&stack_frame, 0, sizeof(stack_frame)); #if defined(_WIN64) int machine_type = IMAGE_FILE_MACHINE_AMD64; - stack_frame.AddrPC.Offset = exception_pointers->ContextRecord->Rip; - stack_frame.AddrFrame.Offset = exception_pointers->ContextRecord->Rbp; - stack_frame.AddrStack.Offset = exception_pointers->ContextRecord->Rsp; + stack_frame.AddrPC.Offset = context_record.Rip; + stack_frame.AddrFrame.Offset = context_record.Rbp; + stack_frame.AddrStack.Offset = context_record.Rsp; #else int machine_type = IMAGE_FILE_MACHINE_I386; - stack_frame.AddrPC.Offset = exception_pointers->ContextRecord->Eip; - stack_frame.AddrFrame.Offset = exception_pointers->ContextRecord->Ebp; - stack_frame.AddrStack.Offset = exception_pointers->ContextRecord->Esp; + stack_frame.AddrPC.Offset = context_record.Eip; + stack_frame.AddrFrame.Offset = context_record.Ebp; + stack_frame.AddrStack.Offset = context_record.Esp; #endif stack_frame.AddrPC.Mode = AddrModeFlat; stack_frame.AddrFrame.Mode = AddrModeFlat; @@ -235,7 +238,7 @@ StackTrace::StackTrace(EXCEPTION_POINTERS* exception_pointers) { GetCurrentProcess(), GetCurrentThread(), &stack_frame, - exception_pointers->ContextRecord, + &context_record, NULL, &SymFunctionTableAccess64, &SymGetModuleBase64, diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index 9acdf3e3b9..175e9cdc39 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -805,7 +805,7 @@ TEST_F(FileUtilTest, ChangeDirectoryPermissionsAndEnumerate) { FileEnumerator f1(subdir_path, true, FileEnumerator::FILES); EXPECT_TRUE(PathExists(subdir_path)); FindResultCollector c1(f1); - EXPECT_EQ(c1.size(), 0); + EXPECT_EQ(0, c1.size()); EXPECT_FALSE(GetPosixFilePermissions(file_name, &mode)); // Give the permissions to the directory. @@ -817,7 +817,7 @@ TEST_F(FileUtilTest, ChangeDirectoryPermissionsAndEnumerate) { FileEnumerator f2(subdir_path, true, FileEnumerator::FILES); FindResultCollector c2(f2); EXPECT_TRUE(c2.HasFile(file_name)); - EXPECT_EQ(c2.size(), 1); + EXPECT_EQ(1, c2.size()); // Delete the file. EXPECT_TRUE(DeleteFile(subdir_path, true)); @@ -1788,8 +1788,8 @@ TEST_F(FileUtilTest, DetectDirectoryTest) { TEST_F(FileUtilTest, FileEnumeratorTest) { // Test an empty directory. FileEnumerator f0(temp_dir_.path(), true, FILES_AND_DIRECTORIES); - EXPECT_EQ(f0.Next().value(), FPL("")); - EXPECT_EQ(f0.Next().value(), FPL("")); + EXPECT_EQ(FPL(""), f0.Next().value()); + EXPECT_EQ(FPL(""), f0.Next().value()); // Test an empty directory, non-recursively, including "..". FileEnumerator f0_dotdot(temp_dir_.path(), false, @@ -1825,7 +1825,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c1.HasFile(file2_abs)); EXPECT_TRUE(c1.HasFile(dir2file)); EXPECT_TRUE(c1.HasFile(dir2innerfile)); - EXPECT_EQ(c1.size(), 4); + EXPECT_EQ(4, c1.size()); // Only enumerate directories. FileEnumerator f2(temp_dir_.path(), true, FileEnumerator::DIRECTORIES); @@ -1833,7 +1833,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c2.HasFile(dir1)); EXPECT_TRUE(c2.HasFile(dir2)); EXPECT_TRUE(c2.HasFile(dir2inner)); - EXPECT_EQ(c2.size(), 3); + EXPECT_EQ(3, c2.size()); // Only enumerate directories non-recursively. FileEnumerator f2_non_recursive( @@ -1841,7 +1841,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { FindResultCollector c2_non_recursive(f2_non_recursive); EXPECT_TRUE(c2_non_recursive.HasFile(dir1)); EXPECT_TRUE(c2_non_recursive.HasFile(dir2)); - EXPECT_EQ(c2_non_recursive.size(), 2); + EXPECT_EQ(2, c2_non_recursive.size()); // Only enumerate directories, non-recursively, including "..". FileEnumerator f2_dotdot(temp_dir_.path(), false, @@ -1851,7 +1851,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c2_dotdot.HasFile(dir1)); EXPECT_TRUE(c2_dotdot.HasFile(dir2)); EXPECT_TRUE(c2_dotdot.HasFile(temp_dir_.path().Append(FPL("..")))); - EXPECT_EQ(c2_dotdot.size(), 3); + EXPECT_EQ(3, c2_dotdot.size()); // Enumerate files and directories. FileEnumerator f3(temp_dir_.path(), true, FILES_AND_DIRECTORIES); @@ -1863,7 +1863,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c3.HasFile(dir2file)); EXPECT_TRUE(c3.HasFile(dir2inner)); EXPECT_TRUE(c3.HasFile(dir2innerfile)); - EXPECT_EQ(c3.size(), 7); + EXPECT_EQ(7, c3.size()); // Non-recursive operation. FileEnumerator f4(temp_dir_.path(), false, FILES_AND_DIRECTORIES); @@ -1872,7 +1872,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c4.HasFile(dir2)); EXPECT_TRUE(c4.HasFile(file1)); EXPECT_TRUE(c4.HasFile(file2_abs)); - EXPECT_EQ(c4.size(), 4); + EXPECT_EQ(4, c4.size()); // Enumerate with a pattern. FileEnumerator f5(temp_dir_.path(), true, FILES_AND_DIRECTORIES, FPL("dir*")); @@ -1882,7 +1882,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c5.HasFile(dir2file)); EXPECT_TRUE(c5.HasFile(dir2inner)); EXPECT_TRUE(c5.HasFile(dir2innerfile)); - EXPECT_EQ(c5.size(), 5); + EXPECT_EQ(5, c5.size()); #if defined(OS_WIN) { @@ -1900,7 +1900,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c6.HasFile(inner2)); EXPECT_TRUE(c6.HasFile(inner2.Append(FPL("innerfile.txt")))); EXPECT_TRUE(c6.HasFile(dir1.Append(FPL("dir2file.txt")))); - EXPECT_EQ(c6.size(), 3); + EXPECT_EQ(3, c6.size()); } // No changes for non recursive operation. @@ -1910,7 +1910,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c7.HasFile(dir2)); EXPECT_TRUE(c7.HasFile(file1)); EXPECT_TRUE(c7.HasFile(file2_abs)); - EXPECT_EQ(c7.size(), 4); + EXPECT_EQ(4, c7.size()); // Should not enumerate inside dir1 when using recursion. FileEnumerator f8(temp_dir_.path(), true, FILES_AND_DIRECTORIES); @@ -1922,7 +1922,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { EXPECT_TRUE(c8.HasFile(dir2file)); EXPECT_TRUE(c8.HasFile(dir2inner)); EXPECT_TRUE(c8.HasFile(dir2innerfile)); - EXPECT_EQ(c8.size(), 7); + EXPECT_EQ(7, c8.size()); } #endif @@ -1978,24 +1978,23 @@ TEST_F(FileUtilTest, ReadFile) { // Read the file with smaller buffer. int bytes_read_small = ReadFile( file_path, &small_buffer[0], static_cast<int>(small_buffer.size())); - EXPECT_EQ(bytes_read_small, static_cast<int>(small_buffer.size())); + EXPECT_EQ(static_cast<int>(small_buffer.size()), bytes_read_small); EXPECT_EQ( - std::string(small_buffer.begin(), small_buffer.end()), - std::string(kTestData.begin(), kTestData.begin() + small_buffer.size())); + std::string(kTestData.begin(), kTestData.begin() + small_buffer.size()), + std::string(small_buffer.begin(), small_buffer.end())); // Read the file with buffer which have exactly same size. int bytes_read_exact = ReadFile( file_path, &exact_buffer[0], static_cast<int>(exact_buffer.size())); - EXPECT_EQ(bytes_read_exact, static_cast<int>(kTestData.size())); - EXPECT_EQ(std::string(exact_buffer.begin(), exact_buffer.end()), kTestData); + EXPECT_EQ(static_cast<int>(kTestData.size()), bytes_read_exact); + EXPECT_EQ(kTestData, std::string(exact_buffer.begin(), exact_buffer.end())); // Read the file with larger buffer. int bytes_read_large = ReadFile( file_path, &large_buffer[0], static_cast<int>(large_buffer.size())); - EXPECT_EQ(bytes_read_large, static_cast<int>(kTestData.size())); - EXPECT_EQ(std::string(large_buffer.begin(), - large_buffer.begin() + kTestData.size()), - kTestData); + EXPECT_EQ(static_cast<int>(kTestData.size()), bytes_read_large); + EXPECT_EQ(kTestData, std::string(large_buffer.begin(), + large_buffer.begin() + kTestData.size())); // Make sure the return value is -1 if the file doesn't exist. FilePath file_path_not_exist = @@ -2081,7 +2080,7 @@ TEST_F(FileUtilTest, TouchFile) { // This timestamp is divisible by one day (in local timezone), // to make it work on FAT too. ASSERT_TRUE(Time::FromString("Wed, 16 Nov 1994, 00:00:00", - &access_time)); + &access_time)); Time modification_time; // Note that this timestamp is divisible by two (seconds) - FAT stores @@ -2092,10 +2091,10 @@ TEST_F(FileUtilTest, TouchFile) { ASSERT_TRUE(TouchFile(foobar, access_time, modification_time)); File::Info file_info; ASSERT_TRUE(GetFileInfo(foobar, &file_info)); - EXPECT_EQ(file_info.last_accessed.ToInternalValue(), - access_time.ToInternalValue()); - EXPECT_EQ(file_info.last_modified.ToInternalValue(), - modification_time.ToInternalValue()); + EXPECT_EQ(access_time.ToInternalValue(), + file_info.last_accessed.ToInternalValue()); + EXPECT_EQ(modification_time.ToInternalValue(), + file_info.last_modified.ToInternalValue()); } TEST_F(FileUtilTest, IsDirectoryEmpty) { diff --git a/base/files/file.cc b/base/files/file.cc index 2a2f84330e..da261d625b 100644 --- a/base/files/file.cc +++ b/base/files/file.cc @@ -60,6 +60,8 @@ File::File(RValue other) } File::~File() { + // Go through the AssertIOAllowed logic. + Close(); } File& File::operator=(RValue other) { diff --git a/base/files/file_path.cc b/base/files/file_path.cc index f5a9e5a0c3..a8b2713998 100644 --- a/base/files/file_path.cc +++ b/base/files/file_path.cc @@ -521,7 +521,7 @@ FilePath FilePath::Append(const FilePath& component) const { } FilePath FilePath::AppendASCII(const StringPiece& component) const { - DCHECK(IsStringASCII(component)); + DCHECK(base::IsStringASCII(component)); #if defined(OS_WIN) return Append(ASCIIToUTF16(component.as_string())); #elif defined(OS_POSIX) @@ -587,7 +587,7 @@ string16 FilePath::LossyDisplayName() const { } std::string FilePath::MaybeAsASCII() const { - if (IsStringASCII(path_)) + if (base::IsStringASCII(path_)) return path_; return std::string(); } @@ -632,7 +632,7 @@ string16 FilePath::LossyDisplayName() const { } std::string FilePath::MaybeAsASCII() const { - if (IsStringASCII(path_)) + if (base::IsStringASCII(path_)) return UTF16ToASCII(path_); return std::string(); } diff --git a/base/files/file_path.h b/base/files/file_path.h index 5410e0d686..008b9f5afc 100644 --- a/base/files/file_path.h +++ b/base/files/file_path.h @@ -321,8 +321,8 @@ class BASE_EXPORT FilePath { // separator. FilePath StripTrailingSeparators() const WARN_UNUSED_RESULT; - // Returns true if this FilePath contains any attempt to reference a parent - // directory (i.e. has a path component that is ".." + // Returns true if this FilePath contains an attempt to reference a parent + // directory (e.g. has a path component that is ".."). bool ReferencesParent() const; // Return a Unicode human-readable version of this path. diff --git a/base/files/file_proxy.cc b/base/files/file_proxy.cc index b517761cf0..fa04d7c44e 100644 --- a/base/files/file_proxy.cc +++ b/base/files/file_proxy.cc @@ -13,27 +13,38 @@ #include "base/task_runner.h" #include "base/task_runner_util.h" +namespace { + +void FileDeleter(base::File file) { +} + +} // namespace + namespace base { class FileHelper { public: FileHelper(FileProxy* proxy, File file) : file_(file.Pass()), - proxy_(AsWeakPtr(proxy)), - error_(File::FILE_ERROR_FAILED) { + error_(File::FILE_ERROR_FAILED), + task_runner_(proxy->task_runner()), + proxy_(AsWeakPtr(proxy)) { } void PassFile() { if (proxy_) proxy_->SetFile(file_.Pass()); + else if (file_.IsValid()) + task_runner_->PostTask(FROM_HERE, Bind(&FileDeleter, Passed(&file_))); } protected: File file_; - WeakPtr<FileProxy> proxy_; File::Error error_; private: + scoped_refptr<TaskRunner> task_runner_; + WeakPtr<FileProxy> proxy_; DISALLOW_COPY_AND_ASSIGN(FileHelper); }; @@ -219,13 +230,12 @@ class WriteHelper : public FileHelper { } // namespace -FileProxy::FileProxy() : task_runner_(NULL) { -} - FileProxy::FileProxy(TaskRunner* task_runner) : task_runner_(task_runner) { } FileProxy::~FileProxy() { + if (file_.IsValid()) + task_runner_->PostTask(FROM_HERE, Bind(&FileDeleter, Passed(&file_))); } bool FileProxy::CreateOrOpen(const FilePath& file_path, diff --git a/base/files/file_proxy.h b/base/files/file_proxy.h index f02960b858..3c834f673e 100644 --- a/base/files/file_proxy.h +++ b/base/files/file_proxy.h @@ -25,11 +25,8 @@ class Time; // same rules of the equivalent File method, as they are implemented by bouncing // the operation to File using a TaskRunner. // -// This class does NOT perform automatic proxying to close the underlying file -// at destruction, which means that it may potentially close the file in the -// wrong thread (the current thread). If that is not appropriate, the caller -// must ensure that Close() is called, so that the operation happens on the -// desired thread. +// This class performs automatic proxying to close the underlying file at +// destruction. // // The TaskRunner is in charge of any sequencing of the operations, but a single // operation can be proxied at a time, regardless of the use of a callback. @@ -131,6 +128,7 @@ class BASE_EXPORT FileProxy : public SupportsWeakPtr<FileProxy> { private: friend class FileHelper; void SetFile(File file); + TaskRunner* task_runner() { return task_runner_.get(); } scoped_refptr<TaskRunner> task_runner_; File file_; diff --git a/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc index bb7e6c3118..7748923717 100644 --- a/base/files/file_proxy_unittest.cc +++ b/base/files/file_proxy_unittest.cc @@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { @@ -143,6 +144,21 @@ TEST_F(FileProxyTest, CreateOrOpen_OpenNonExistent) { EXPECT_FALSE(PathExists(test_path())); } +TEST_F(FileProxyTest, CreateOrOpen_AbandonedCreate) { + bool prev = ThreadRestrictions::SetIOAllowed(false); + { + FileProxy proxy(file_task_runner()); + proxy.CreateOrOpen( + test_path(), + File::FLAG_CREATE | File::FLAG_READ, + Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr())); + } + MessageLoop::current()->Run(); + ThreadRestrictions::SetIOAllowed(prev); + + EXPECT_TRUE(PathExists(test_path())); +} + TEST_F(FileProxyTest, Close) { // Creates a file. FileProxy proxy(file_task_runner()); diff --git a/base/mac/mac_logging.h b/base/mac/mac_logging.h index ecd9b6b0a0..02f205d853 100644 --- a/base/mac/mac_logging.h +++ b/base/mac/mac_logging.h @@ -73,10 +73,10 @@ class BASE_EXPORT OSStatusLogMessage : public logging::LogMessage { DLOG_IS_ON(severity) && (condition)) #define OSSTATUS_DVLOG(verbose_level, status) \ - LAZY_STREAM(OSSTATUS_VPLOG_STREAM(verbose_level, status), \ + LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status), \ DVLOG_IS_ON(verbose_level)) #define OSSTATUS_DVLOG_IF(verbose_level, condition, status) \ - LAZY_STREAM(OSSTATUS_VPLOG_STREAM(verbose_level, status) \ + LAZY_STREAM(OSSTATUS_VLOG_STREAM(verbose_level, status) \ DVLOG_IS_ON(verbose_level) && (condition)) #define OSSTATUS_DCHECK(condition, status) \ diff --git a/base/mac/mach_logging.cc b/base/mac/mach_logging.cc new file mode 100644 index 0000000000..0ab6416fbe --- /dev/null +++ b/base/mac/mach_logging.cc @@ -0,0 +1,81 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/mac/mach_logging.h" + +#include <servers/bootstrap.h> + +#include <iomanip> +#include <string> + +#include "base/strings/stringprintf.h" + +namespace { + +std::string FormatMachErrorNumber(mach_error_t mach_err) { + // For the os/kern subsystem, give the error number in decimal as in + // <mach/kern_return.h>. Otherwise, give it in hexadecimal to make it easier + // to visualize the various bits. See <mach/error.h>. + if (mach_err >= 0 && mach_err < KERN_RETURN_MAX) { + return base::StringPrintf(" (%d)", mach_err); + } + return base::StringPrintf(" (0x%08x)", mach_err); +} + +} // namespace + +namespace logging { + +MachLogMessage::MachLogMessage(const char* file_path, + int line, + LogSeverity severity, + mach_error_t mach_err) + : LogMessage(file_path, line, severity), + mach_err_(mach_err) { +} + +MachLogMessage::~MachLogMessage() { + stream() << ": " + << mach_error_string(mach_err_) + << FormatMachErrorNumber(mach_err_); +} + +BootstrapLogMessage::BootstrapLogMessage(const char* file_path, + int line, + LogSeverity severity, + kern_return_t bootstrap_err) + : LogMessage(file_path, line, severity), + bootstrap_err_(bootstrap_err) { +} + +BootstrapLogMessage::~BootstrapLogMessage() { + stream() << ": " + << bootstrap_strerror(bootstrap_err_); + + switch (bootstrap_err_) { + case BOOTSTRAP_SUCCESS: + case BOOTSTRAP_NOT_PRIVILEGED: + case BOOTSTRAP_NAME_IN_USE: + case BOOTSTRAP_UNKNOWN_SERVICE: + case BOOTSTRAP_SERVICE_ACTIVE: + case BOOTSTRAP_BAD_COUNT: + case BOOTSTRAP_NO_MEMORY: + case BOOTSTRAP_NO_CHILDREN: { + // Show known bootstrap errors in decimal because that's how they're + // defined in <servers/bootstrap.h>. + stream() << " (" << bootstrap_err_ << ")"; + break; + } + + default: { + // bootstrap_strerror passes unknown errors to mach_error_string, so + // format them as they would be if they were handled by + // MachErrorMessage. + stream() << FormatMachErrorNumber(bootstrap_err_); + break; + } + } +} + +} // namespace logging diff --git a/base/mac/mach_logging.h b/base/mac/mach_logging.h new file mode 100644 index 0000000000..589dde2017 --- /dev/null +++ b/base/mac/mach_logging.h @@ -0,0 +1,149 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_MAC_MACH_LOGGING_H_ +#define BASE_MAC_MACH_LOGGING_H_ + +#include <mach/mach.h> + +#include "base/basictypes.h" +#include "base/logging.h" + +// Use the MACH_LOG family of macros along with a mach_error_t (kern_return_t) +// containing a Mach error. The error value will be decoded so that logged +// messages explain the error. +// +// Use the BOOTSTRAP_LOG family of macros specifically for errors that occur +// while interoperating with the bootstrap subsystem. These errors will first +// be looked up as bootstrap error messages. If no match is found, they will +// be treated as generic Mach errors, as in MACH_LOG. +// +// Examples: +// +// kern_return_t kr = mach_timebase_info(&info); +// if (kr != KERN_SUCCESS) { +// MACH_LOG(ERROR, kr) << "mach_timebase_info"; +// } +// +// kr = mach_vm_deallocate(task, address, size); +// MACH_DCHECK(kr == KERN_SUCCESS, kr) << "mach_vm_deallocate"; + +namespace logging { + +class MachLogMessage : public logging::LogMessage { + public: + MachLogMessage(const char* file_path, + int line, + LogSeverity severity, + mach_error_t mach_err); + ~MachLogMessage(); + + private: + mach_error_t mach_err_; + + DISALLOW_COPY_AND_ASSIGN(MachLogMessage); +}; + +class BootstrapLogMessage : public logging::LogMessage { + public: + BootstrapLogMessage(const char* file_path, + int line, + LogSeverity severity, + kern_return_t bootstrap_err); + ~BootstrapLogMessage(); + + private: + kern_return_t bootstrap_err_; + + DISALLOW_COPY_AND_ASSIGN(BootstrapLogMessage); +}; + +} // namespace logging + +#define MACH_LOG_STREAM(severity, mach_err) \ + COMPACT_GOOGLE_LOG_EX_ ## severity(MachLogMessage, mach_err).stream() +#define MACH_VLOG_STREAM(verbose_level, mach_err) \ + logging::MachLogMessage(__FILE__, __LINE__, \ + -verbose_level, mach_err).stream() + +#define MACH_LOG(severity, mach_err) \ + LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity)) +#define MACH_LOG_IF(severity, condition, mach_err) \ + LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \ + LOG_IS_ON(severity) && (condition)) + +#define MACH_VLOG(verbose_level, mach_err) \ + LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ + VLOG_IS_ON(verbose_level)) +#define MACH_VLOG_IF(verbose_level, condition, mach_err) \ + LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ + VLOG_IS_ON(verbose_level) && (condition)) + +#define MACH_CHECK(condition, mach_err) \ + LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), !(condition)) \ + << "Check failed: " # condition << ". " + +#define MACH_DLOG(severity, mach_err) \ + LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity)) +#define MACH_DLOG_IF(severity, condition, mach_err) \ + LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \ + DLOG_IS_ON(severity) && (condition)) + +#define MACH_DVLOG(verbose_level, mach_err) \ + LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ + DVLOG_IS_ON(verbose_level)) +#define MACH_DVLOG_IF(verbose_level, condition, mach_err) \ + LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err) \ + DVLOG_IS_ON(verbose_level) && (condition)) + +#define MACH_DCHECK(condition, mach_err) \ + LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), \ + DCHECK_IS_ON && !(condition)) \ + << "Check failed: " # condition << ". " + +#define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \ + COMPACT_GOOGLE_LOG_EX_ ## severity(BootstrapLogMessage, \ + bootstrap_err).stream() +#define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \ + logging::BootstrapLogMessage(__FILE__, __LINE__, \ + -verbose_level, bootstrap_err).stream() + +#define BOOTSTRAP_LOG(severity, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, \ + bootstrap_err), LOG_IS_ON(severity)) +#define BOOTSTRAP_LOG_IF(severity, condition, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \ + LOG_IS_ON(severity) && (condition)) + +#define BOOTSTRAP_VLOG(verbose_level, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ + VLOG_IS_ON(verbose_level)) +#define BOOTSTRAP_VLOG_IF(verbose_level, condition, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ + VLOG_IS_ON(verbose_level) && (condition)) + +#define BOOTSTRAP_CHECK(condition, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), !(condition)) \ + << "Check failed: " # condition << ". " + +#define BOOTSTRAP_DLOG(severity, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \ + DLOG_IS_ON(severity)) +#define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \ + DLOG_IS_ON(severity) && (condition)) + +#define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ + DVLOG_IS_ON(verbose_level)) +#define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \ + DVLOG_IS_ON(verbose_level) && (condition)) + +#define BOOTSTRAP_DCHECK(condition, bootstrap_err) \ + LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \ + DCHECK_IS_ON && !(condition)) \ + << "Check failed: " # condition << ". " + +#endif // BASE_MAC_MACH_LOGGING_H_ diff --git a/base/mac/scoped_mach_vm.cc b/base/mac/scoped_mach_vm.cc new file mode 100644 index 0000000000..a9055aac72 --- /dev/null +++ b/base/mac/scoped_mach_vm.cc @@ -0,0 +1,33 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/mac/scoped_mach_vm.h" + +namespace base { +namespace mac { + +void ScopedMachVM::reset(mach_vm_address_t address, mach_vm_size_t size) { + DCHECK(address % PAGE_SIZE == 0); + DCHECK(size % PAGE_SIZE == 0); + + if (size_) { + if (address_ < address) { + mach_vm_deallocate(mach_task_self(), + address_, + std::min(size_, address - address_)); + } + if (address_ + size_ > address + size) { + mach_vm_address_t deallocate_start = std::max(address_, address + size); + mach_vm_deallocate(mach_task_self(), + deallocate_start, + address_ + size_ - deallocate_start); + } + } + + address_ = address; + size_ = size; +} + +} // namespace mac +} // namespace base diff --git a/base/mac/scoped_mach_vm.h b/base/mac/scoped_mach_vm.h new file mode 100644 index 0000000000..065b968f37 --- /dev/null +++ b/base/mac/scoped_mach_vm.h @@ -0,0 +1,93 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_MAC_SCOPED_MACH_VM_H_ +#define BASE_MAC_SCOPED_MACH_VM_H_ + +#include <mach/mach.h> +#include <mach/mach_vm.h> + +#include <algorithm> + +#include "base/basictypes.h" +#include "base/logging.h" + +// Use ScopedMachVM to supervise ownership of pages in the current process +// through the Mach VM subsystem. Pages allocated with mach_vm_allocate can be +// released when exiting a scope with ScopedMachVM. +// +// The Mach VM subsystem operates on a page-by-page basis, and a single VM +// allocation managed by a ScopedMachVM object may span multiple pages. As far +// as Mach is concerned, allocated pages may be deallocated individually. This +// is in contrast to higher-level allocators such as malloc, where the base +// address of an allocation implies the size of an allocated block. +// Consequently, it is not sufficient to just pass the base address of an +// allocation to ScopedMachVM, it also needs to know the size of the +// allocation. To avoid any confusion, both the base address and size must +// be page-aligned. +// +// When dealing with Mach VM, base addresses will naturally be page-aligned, +// but user-specified sizes may not be. If there's a concern that a size is +// not page-aligned, use the mach_vm_round_page macro to correct it. +// +// Example: +// +// mach_vm_address_t address = 0; +// mach_vm_size_t size = 12345; // This requested size is not page-aligned. +// kern_return_t kr = +// mach_vm_allocate(mach_task_self(), &address, size, VM_FLAGS_ANYWHERE); +// if (kr != KERN_SUCCESS) { +// return false; +// } +// ScopedMachVM vm_owner(address, mach_vm_round_page(size)); + +namespace base { +namespace mac { + +class ScopedMachVM { + public: + explicit ScopedMachVM(mach_vm_address_t address = 0, mach_vm_size_t size = 0) + : address_(address), + size_(size) { + DCHECK(address % PAGE_SIZE == 0); + DCHECK(size % PAGE_SIZE == 0); + } + + ~ScopedMachVM() { + if (size_) { + mach_vm_deallocate(mach_task_self(), address_, size_); + } + } + + void reset(mach_vm_address_t address = 0, mach_vm_size_t size = 0); + + mach_vm_address_t address() const { + return address_; + } + + mach_vm_size_t size() const { + return size_; + } + + void swap(ScopedMachVM& that) { + std::swap(address_, that.address_); + std::swap(size_, that.size_); + } + + void release() { + address_ = 0; + size_ = 0; + } + + private: + mach_vm_address_t address_; + mach_vm_size_t size_; + + DISALLOW_COPY_AND_ASSIGN(ScopedMachVM); +}; + +} // namespace mac +} // namespace base + +#endif // BASE_MAC_SCOPED_MACH_VM_H_ diff --git a/base/memory/discardable_memory_manager.cc b/base/memory/discardable_memory_manager.cc index 6ede8a39cf..468690b7c9 100644 --- a/base/memory/discardable_memory_manager.cc +++ b/base/memory/discardable_memory_manager.cc @@ -14,11 +14,10 @@ namespace base { namespace internal { namespace { -// This is admittedly pretty magical. It's approximately enough memory for four +// This is admittedly pretty magical. It's approximately enough memory for eight // 2560x1600 images. -static const size_t kDefaultMemoryLimit = 64 * 1024 * 1024; -static const size_t kDefaultBytesToKeepUnderModeratePressure = - kDefaultMemoryLimit / 4; +static const size_t kDefaultMemoryLimit = 128 * 1024 * 1024; +static const size_t kDefaultBytesToKeepUnderModeratePressure = 12 * 1024 * 1024; } // namespace diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc index 57843f401f..1bda3dcada 100644 --- a/base/observer_list_unittest.cc +++ b/base/observer_list_unittest.cc @@ -443,7 +443,7 @@ TEST(ObserverListTest, Existing) { EXPECT_TRUE(b.added); // B's adder should not have been notified because it was added during - // notificaiton. + // notification. EXPECT_EQ(0, b.adder.total); // Notify again to make sure b's adder is notified. @@ -467,7 +467,7 @@ TEST(ObserverListThreadSafeTest, Existing) { EXPECT_TRUE(b.added); // B's adder should not have been notified because it was added during - // notificaiton. + // notification. EXPECT_EQ(0, b.adder.total); // Notify again to make sure b's adder is notified. diff --git a/base/path_service.cc b/base/path_service.cc index 61488d6f75..75833db9a1 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -233,13 +233,15 @@ bool PathService::Get(int key, FilePath* result) { // static bool PathService::Override(int key, const FilePath& path) { - // Just call the full function with true for the value of |create|. - return OverrideAndCreateIfNeeded(key, path, true); + // Just call the full function with true for the value of |create|, and + // assume that |path| may not be absolute yet. + return OverrideAndCreateIfNeeded(key, path, false, true); } // static bool PathService::OverrideAndCreateIfNeeded(int key, const FilePath& path, + bool is_absolute, bool create) { PathData* path_data = GetPathData(); DCHECK(path_data); @@ -259,9 +261,12 @@ bool PathService::OverrideAndCreateIfNeeded(int key, } // We need to have an absolute path. - file_path = MakeAbsoluteFilePath(file_path); - if (file_path.empty()) - return false; + if (!is_absolute) { + file_path = MakeAbsoluteFilePath(file_path); + if (file_path.empty()) + return false; + } + DCHECK(file_path.IsAbsolute()); base::AutoLock scoped_lock(path_data->lock); diff --git a/base/path_service.h b/base/path_service.h index 9759754377..554eb9e346 100644 --- a/base/path_service.h +++ b/base/path_service.h @@ -46,11 +46,18 @@ class BASE_EXPORT PathService { // one test should not carry over to another. static bool Override(int key, const base::FilePath& path); - // This function does the same as PathService::Override but it takes an extra - // parameter |create| which guides whether the directory to be overriden must + // This function does the same as PathService::Override but it takes extra + // parameters: + // - |is_absolute| indicates that |path| has already been expanded into an + // absolute path, otherwise MakeAbsoluteFilePath() will be used. This is + // useful to override paths that may not exist yet, since MakeAbsoluteFilePath + // fails for those. Note that MakeAbsoluteFilePath also expands symbolic + // links, even if path.IsAbsolute() is already true. + // - |create| guides whether the directory to be overriden must // be created in case it doesn't exist already. static bool OverrideAndCreateIfNeeded(int key, const base::FilePath& path, + bool is_absolute, bool create); // To extend the set of supported keys, you can register a path provider, diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc index d5296cf7aa..7a70a89c41 100644 --- a/base/path_service_unittest.cc +++ b/base/path_service_unittest.cc @@ -147,7 +147,7 @@ TEST_F(PathServiceTest, Get) { #endif } -// test that all versions of the Override function of PathService do what they +// Test that all versions of the Override function of PathService do what they // are supposed to do. TEST_F(PathServiceTest, Override) { int my_special_key = 666; @@ -163,12 +163,41 @@ TEST_F(PathServiceTest, Override) { // PathService::OverrideAndCreateIfNeeded should obey the |create| parameter. PathService::OverrideAndCreateIfNeeded(my_special_key, fake_cache_dir2, + false, false); EXPECT_FALSE(base::PathExists(fake_cache_dir2)); EXPECT_TRUE(PathService::OverrideAndCreateIfNeeded(my_special_key, fake_cache_dir2, + false, true)); EXPECT_TRUE(base::PathExists(fake_cache_dir2)); + +#if defined(OS_POSIX) + base::FilePath non_existent( + base::MakeAbsoluteFilePath(temp_dir.path()).AppendASCII("non_existent")); + EXPECT_TRUE(non_existent.IsAbsolute()); + EXPECT_FALSE(base::PathExists(non_existent)); +#if !defined(OS_ANDROID) + // This fails because MakeAbsoluteFilePath fails for non-existent files. + // Earlier versions of Bionic libc don't fail for non-existent files, so + // skip this check on Android. + EXPECT_FALSE(PathService::OverrideAndCreateIfNeeded(my_special_key, + non_existent, + false, + false)); +#endif + // This works because indicating that |non_existent| is absolute skips the + // internal MakeAbsoluteFilePath call. + EXPECT_TRUE(PathService::OverrideAndCreateIfNeeded(my_special_key, + non_existent, + true, + false)); + // Check that the path has been overridden and no directory was created. + EXPECT_FALSE(base::PathExists(non_existent)); + base::FilePath path; + EXPECT_TRUE(PathService::Get(my_special_key, &path)); + EXPECT_EQ(non_existent, path); +#endif } // Check if multiple overrides can co-exist. diff --git a/base/security_unittest.cc b/base/security_unittest.cc index fa067c8148..960bc20276 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -78,9 +78,10 @@ bool CallocDiesOnOOM() { // The sanitizers' calloc dies on OOM instead of returning NULL. // The wrapper function in base/process_util_linux.cc that is used when we // compile without TCMalloc will just die on OOM instead of returning NULL. -#if !defined(OS_WIN) && (defined(ADDRESS_SANITIZER) || \ - defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \ - (defined(OS_LINUX) && defined(NO_TCMALLOC))) +#if defined(ADDRESS_SANITIZER) || \ + defined(MEMORY_SANITIZER) || \ + defined(THREAD_SANITIZER) || \ + (defined(OS_LINUX) && defined(NO_TCMALLOC)) return true; #else return false; diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc index e514ac1a63..0adb98959f 100644 --- a/base/strings/string_util.cc +++ b/base/strings/string_util.cc @@ -324,8 +324,6 @@ bool ContainsOnlyChars(const StringPiece16& input, return input.find_first_not_of(characters) == StringPiece16::npos; } -} // namespace base - template<class STR> static bool DoIsStringASCII(const STR& str) { for (size_t i = 0; i < str.length(); i++) { @@ -336,11 +334,11 @@ static bool DoIsStringASCII(const STR& str) { return true; } -bool IsStringASCII(const base::StringPiece& str) { +bool IsStringASCII(const StringPiece& str) { return DoIsStringASCII(str); } -bool IsStringASCII(const base::string16& str) { +bool IsStringASCII(const string16& str) { return DoIsStringASCII(str); } @@ -352,12 +350,14 @@ bool IsStringUTF8(const std::string& str) { while (char_index < src_len) { int32 code_point; CBU8_NEXT(src, char_index, src_len, code_point); - if (!base::IsValidCharacter(code_point)) + if (!IsValidCharacter(code_point)) return false; } return true; } +} // namespace base + template<typename Iter> static inline bool DoLowerCaseEqualsASCII(Iter a_begin, Iter a_end, diff --git a/base/strings/string_util.h b/base/strings/string_util.h index 473deaebe8..9478a0c475 100644 --- a/base/strings/string_util.h +++ b/base/strings/string_util.h @@ -234,16 +234,6 @@ BASE_EXPORT bool ContainsOnlyChars(const StringPiece& input, BASE_EXPORT bool ContainsOnlyChars(const StringPiece16& input, const StringPiece16& characters); -} // namespace base - -#if defined(OS_WIN) -#include "base/strings/string_util_win.h" -#elif defined(OS_POSIX) -#include "base/strings/string_util_posix.h" -#else -#error Define string operations appropriately for your platform -#endif - // Returns true if the specified string matches the criteria. How can a wide // string be 8-bit or UTF8? It contains only characters that are < 256 (in the // first case) or characters that use only 8-bits and whose 8-bit @@ -256,8 +246,18 @@ BASE_EXPORT bool ContainsOnlyChars(const StringPiece16& input, // there's a use case for just checking the structural validity, we have to // add a new function for that. BASE_EXPORT bool IsStringUTF8(const std::string& str); -BASE_EXPORT bool IsStringASCII(const base::StringPiece& str); -BASE_EXPORT bool IsStringASCII(const base::string16& str); +BASE_EXPORT bool IsStringASCII(const StringPiece& str); +BASE_EXPORT bool IsStringASCII(const string16& str); + +} // namespace base + +#if defined(OS_WIN) +#include "base/strings/string_util_win.h" +#elif defined(OS_POSIX) +#include "base/strings/string_util_posix.h" +#else +#error Define string operations appropriately for your platform +#endif // Converts the elements of the given string. This version uses a pointer to // clearly differentiate it from the non-pointer variant. diff --git a/base/strings/utf_string_conversions.h b/base/strings/utf_string_conversions.h index e12e8a767e..13e0b7193b 100644 --- a/base/strings/utf_string_conversions.h +++ b/base/strings/utf_string_conversions.h @@ -50,11 +50,4 @@ BASE_EXPORT std::string UTF16ToASCII(const string16& utf16); } // namespace base -// We are trying to get rid of wstring as much as possible, but it's too big a -// mess to do it all at once. These synonyms should be used when we really -// should just be passing a string16 around, but we haven't finished porting -// whatever module uses wstring and the conversion is being used as a stopgap. -// This makes it easy to grep for the ones that should be removed. -#define WideToUTF16Hack WideToUTF16 - #endif // BASE_STRINGS_UTF_STRING_CONVERSIONS_H_ diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm.mk b/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm.mk index 56ff8540f2..361d97a0fc 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm.mk +++ b/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm.mk @@ -39,7 +39,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -126,7 +125,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86.mk b/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86.mk index 2923266b2d..748b66269c 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86.mk +++ b/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86.mk @@ -41,7 +41,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86_64.mk b/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86_64.mk index 151f9ecd98..59d7604c39 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86_64.mk +++ b/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86_64.mk @@ -41,7 +41,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm.mk b/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm.mk index 56ff8540f2..361d97a0fc 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm.mk +++ b/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm.mk @@ -39,7 +39,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -126,7 +125,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-format \ -fno-tree-sra \ - -fuse-ld=gold \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk b/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk index 2923266b2d..748b66269c 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk +++ b/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk @@ -41,7 +41,6 @@ MY_CFLAGS_Debug := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -mfpmath=sse \ -mmmx \ -m32 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86_64.mk b/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86_64.mk index 151f9ecd98..59d7604c39 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86_64.mk +++ b/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86_64.mk @@ -41,7 +41,6 @@ MY_CFLAGS_Debug := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -128,7 +127,6 @@ MY_CFLAGS_Release := \ -Wno-format \ -m64 \ -march=x86-64 \ - -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ diff --git a/base/win/dllmain.cc b/base/win/dllmain.cc index 9d2a6dc76c..907c7f4034 100644 --- a/base/win/dllmain.cc +++ b/base/win/dllmain.cc @@ -54,9 +54,9 @@ static void NTAPI on_callback(PVOID h, DWORD reason, PVOID reserved); #endif // _WIN64 -// Explicitly depend on tlssup.cc variable to bracket the list of TLS callbacks. -extern "C" PIMAGE_TLS_CALLBACK __xl_a; -extern "C" PIMAGE_TLS_CALLBACK __xl_z; +// Explicitly depend on VC\crt\src\tlssup.c variables +// to bracket the list of TLS callbacks. +extern "C" PIMAGE_TLS_CALLBACK __xl_a, __xl_z; // extern "C" suppresses C++ name mangling so we know the symbol names for the // linker /INCLUDE:symbol pragmas above. |