diff --git a/Android.bp b/Android.bp index b91ea131124c885854dbc8bef4b6c7707844d6a7..ee381a42d72847da18dd264a0bcfe042fcc76b57 100644 --- a/Android.bp +++ b/Android.bp @@ -1121,6 +1121,7 @@ filegroup { "core/java/com/android/internal/os/SomeArgs.java", "core/java/com/android/internal/util/BitwiseInputStream.java", "core/java/com/android/internal/util/BitwiseOutputStream.java", + "core/java/com/android/internal/util/FunctionalUtils.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/IndentingPrintWriter.java", "core/java/com/android/internal/util/Preconditions.java", @@ -1222,44 +1223,4 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x build = [ "StubLibraries.bp", "ApiDocs.bp", -] - -java_library { - name: "framework-telephony", - srcs: [ - //":framework-telephony-sources", - //":framework-telephony-shared-srcs", - ], - // TODO: change to framework-system-stub to build against system APIs. - libs: [ - "framework-minus-apex", - "unsupportedappusage", - ], - static_libs: [ - "libphonenumber-platform", - "app-compat-annotations", - ], - sdk_version: "core_platform", - aidl: { - export_include_dirs: ["telephony/java"], - include_dirs: [ - "frameworks/native/aidl/binder", - "frameworks/native/aidl/gui", - ] - }, - jarjar_rules: ":framework-telephony-jarjar-rules", - dxflags: [ - "--core-library", - "--multi-dex", - ], - // This is to break the dependency from boot jars. - dex_preopt: { - enabled: false, - }, - installable: true, -} - -filegroup { - name: "framework-telephony-jarjar-rules", - srcs: ["telephony/framework-telephony-jarjar-rules.txt"], -} \ No newline at end of file +] \ No newline at end of file diff --git a/apct-tests/perftests/core/AndroidTest.xml b/apct-tests/perftests/core/AndroidTest.xml index 478cfc1fe811cc6881be6e178890a7a53947d8f6..1b289130124f28c502b25206383f2a5ecb058abf 100644 --- a/apct-tests/perftests/core/AndroidTest.xml +++ b/apct-tests/perftests/core/AndroidTest.xml @@ -25,9 +25,4 @@