diff options
author | Mohannad Farrag <aymanm@google.com> | 2024-01-19 12:04:41 +0000 |
---|---|---|
committer | Mohannad Farrag <aymanm@google.com> | 2024-01-19 12:14:47 +0000 |
commit | 781c3491f71788b190daf42f6c631bdc9fa935b2 (patch) | |
tree | f72b06e7ce587813e073e9c5f031a75bec1b2830 | |
parent | 5ab8eee2f1dd6a40a5bb6932f5ea6b7de5f0b5b5 (diff) | |
download | cronet-781c3491f71788b190daf42f6c631bdc9fa935b2.tar.gz |
Remove base divergence
* Removed divergence by executing `git checkout aosp/upstream-import -- files`.
* This was only possible because of aosp/2917946 and b/303040212
Test: m && atest NetHttpTests
Bug: 304217500
Change-Id: Iab52d924c443c867650bf556121cdc0c70cbf934
7 files changed, 5 insertions, 24 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 1b019fe51..20d4c66cc 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,9 +19,7 @@ #include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/posix/eintr_wrapper.h" #include "build/build_config.h" -#if !defined(__NR_getrandom) // This is used to compile Cronet in AOSP -#include "third_party/lss/linux_syscall_support.h" -#elif BUILDFLAG(IS_MAC) +#if 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 427d88470..753b8e428 100644 --- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java +++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java @@ -33,7 +33,6 @@ 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 49ffc1954..765267187 100644 --- a/base/android/java/src/org/chromium/base/PiiElider.java +++ b/base/android/java/src/org/chromium/base/PiiElider.java @@ -5,7 +5,6 @@ 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 f1af9f123..6aaa4c46a 100644 --- a/base/message_loop/message_pump_android.cc +++ b/base/message_loop/message_pump_android.cc @@ -4,13 +4,7 @@ #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 a0e2c56ae..c46994063 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 0a4df2d83..bbb3b0204 100644 --- a/base/test/test_support_android.cc +++ b/base/test/test_support_android.cc @@ -2,13 +2,7 @@ // 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> @@ -216,11 +210,8 @@ namespace base { void InitAndroidTestPaths(const FilePath& test_data_dir) { if (g_test_data_dir) { - 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; + CHECK(test_data_dir == *g_test_data_dir); + return; } 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 ce774f9ff..ef12d9df7 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/base_tracing.h" +#include "base/trace_event/trace_event.h" namespace base { |