diff options
author | Florian Muller <mullerf@google.com> | 2024-01-22 20:36:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-22 20:36:58 +0000 |
commit | b43ed43587b31801e21d24aeba8d3daefc6b60ef (patch) | |
tree | 83e71be75aa49acde72ce540d2f736be3a2c9491 | |
parent | 781c3491f71788b190daf42f6c631bdc9fa935b2 (diff) | |
download | cronet-b43ed43587b31801e21d24aeba8d3daefc6b60ef.tar.gz |
Revert "Remove base divergence"
This reverts commit 781c3491f71788b190daf42f6c631bdc9fa935b2.
Reason for revert: b/321765622
Change-Id: Iad009b6b69b05ee4e4183c880beb62f5b9b24c6d
7 files changed, 24 insertions, 5 deletions
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc index 20d4c66cc..1b019fe51 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc @@ -19,7 +19,9 @@ #include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/eintr_wrapper.h" #include "build/build_config.h" -#if BUILDFLAG(IS_MAC) +#if !defined(__NR_getrandom) // This is used to compile Cronet in AOSP +#include "third_party/lss/linux_syscall_support.h" +#elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. // (See below.) #include <sys/random.h> diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java index 753b8e428..427d88470 100644 --- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java +++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java @@ -33,6 +33,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import java.io.IOException; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; diff --git a/base/android/java/src/org/chromium/base/PiiElider.java b/base/android/java/src/org/chromium/base/PiiElider.java index 765267187..49ffc1954 100644 --- a/base/android/java/src/org/chromium/base/PiiElider.java +++ b/base/android/java/src/org/chromium/base/PiiElider.java @@ -5,6 +5,7 @@ package org.chromium.base; import android.text.TextUtils; +import android.util.Log; import android.util.Patterns; import org.jni_zero.CalledByNative; diff --git a/base/message_loop/message_pump_android.cc b/base/message_loop/message_pump_android.cc index 6aaa4c46a..f1af9f123 100644 --- a/base/message_loop/message_pump_android.cc +++ b/base/message_loop/message_pump_android.cc @@ -4,7 +4,13 @@ #include "base/message_loop/message_pump_android.h" +// This file is included by modules that have host support but android/looper.h is not supported +// on host. __REMOVED_IN needs to be defined in order for android/looper.h to be compiled. +#ifndef __BIONIC__ +#define __REMOVED_IN(x) __attribute__((deprecated)) +#endif #include <android/looper.h> + #include <errno.h> #include <fcntl.h> #include <jni.h> diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/PackageManagerWrapper.java b/base/test/android/javatests/src/org/chromium/base/test/util/PackageManagerWrapper.java index c46994063..a0e2c56ae 100644 --- a/base/test/android/javatests/src/org/chromium/base/test/util/PackageManagerWrapper.java +++ b/base/test/android/javatests/src/org/chromium/base/test/util/PackageManagerWrapper.java @@ -542,4 +542,4 @@ public class PackageManagerWrapper extends PackageManager { protected Drawable getUserBadgeForDensity(UserHandle userHandle, int i) { return null; } -} +}
\ No newline at end of file diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc index bbb3b0204..0a4df2d83 100644 --- a/base/test/test_support_android.cc +++ b/base/test/test_support_android.cc @@ -2,7 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// This file is included by modules that have host support but android/looper.h is not supported +// on host. __REMOVED_IN needs to be defined in order for android/looper.h to be compiled. +#ifndef __BIONIC__ +#define __REMOVED_IN(x) __attribute__((deprecated)) +#endif #include <android/looper.h> + #include <stdarg.h> #include <string.h> @@ -210,8 +216,11 @@ namespace base { void InitAndroidTestPaths(const FilePath& test_data_dir) { if (g_test_data_dir) { - CHECK(test_data_dir == *g_test_data_dir); - return; + if (test_data_dir == *g_test_data_dir) { + return; + } + LOG(INFO) << "Test data dir was " << *g_test_data_dir + << ", attempted change to " << test_data_dir; } g_test_data_dir = new FilePath(test_data_dir); InitPathProvider(DIR_ANDROID_APP_DATA); diff --git a/base/trace_event/memory_dump_manager.h b/base/trace_event/memory_dump_manager.h index ef12d9df7..ce774f9ff 100644 --- a/base/trace_event/memory_dump_manager.h +++ b/base/trace_event/memory_dump_manager.h @@ -20,7 +20,7 @@ #include "base/trace_event/memory_dump_provider_info.h" #include "base/trace_event/memory_dump_request_args.h" #include "base/trace_event/process_memory_dump.h" -#include "base/trace_event/trace_event.h" +#include "base/trace_event/base_tracing.h" namespace base { |