diff options
author | Yiming Jing <yimingjing@google.com> | 2021-01-29 20:45:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 20:45:53 +0000 |
commit | 7c7d9aa1328d5cae63412c961c489da57aede0e5 (patch) | |
tree | 1be300763fa5343f61f0eca7f4548accfc42444e | |
parent | 93fcccc24558a4517938ec62b064c6d419604ebf (diff) | |
parent | d44320ba72976e95d56a1206cd4adea8ebeea50c (diff) | |
download | DebuggingRestrictionController-7c7d9aa1328d5cae63412c961c489da57aede0e5.tar.gz |
Revert "Setup Android.bp and dependencies to build in tree" am: d44320ba72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/DebuggingRestrictionController/+/13431980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I800d5e38e813f9a123e4600d5a172ec31193c4e4
21 files changed, 0 insertions, 207 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index e76ee2b..0000000 --- a/Android.bp +++ /dev/null @@ -1,49 +0,0 @@ -android_app { - name: "DebuggingRestrictionController", - srcs: ["app/src/main/java/**/*.java", "soong/BuildConfig.java", "soong/FirebaseApplication.java"], - resource_dirs: ["app/src/main/res"], - manifest: "soong/AndroidManifest.xml", - sdk_version: "system_current", - certificate: "platform", - privileged: true, - optimize: { - enabled: true, - proguard_flags_files: ["app/proguard-rules.pro"], - }, - - static_libs: [ - "com.google.android.material_material", - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx-constraintlayout_constraintlayout", - - "androidx.lifecycle_lifecycle-livedata", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.lifecycle_lifecycle-runtime", - "androidx.lifecycle_lifecycle-extensions", - "androidx.legacy_legacy-support-v4", - "androidx.test.espresso.idling-resource", - - "guava", - "jsr305", - - "prebuilt-google-play-services-v26-base-1p", - "prebuilt-google-play-services-v26-basement-1p", - "prebuilt-google-play-services-v26-auth-1p", - "prebuilt-google-play-services-v26-auth-base-1p", - "prebuilt-google-play-services-v26-tasks-1p", - - "prebuilt-google-play-services-v26-firebase-common-1p", - "prebuilt-google-play-services-v26-firebase-auth-1p", - "prebuilt-google-play-services-v26-firebase_auth_interop-1p", - "prebuilt-google-play-services-v26-firebase-iid-1p", - "prebuilt-google-play-services-v26-firebase-iid-interop-1p", - - "drc_static_libs", - "drc-lib-firebase-functions-16.1.0" - ], - - //required: ["allowed_privapp_com.android.car.debuggingrestrictioncontroller"], -} - - diff --git a/libs/Android.bp b/libs/Android.bp deleted file mode 100644 index 5aecfee..0000000 --- a/libs/Android.bp +++ /dev/null @@ -1,41 +0,0 @@ -android_library_import { - name: "drc-lib-firebase-functions-16.1.0", - aars: ["firebase-functions-16.1.0.aar"], - sdk_version: "current", -} - -android_library_import { - name: "drc-lib-firebase-components-16.1.0", - aars: ["firebase-components-16.1.0.aar"], - sdk_version: "current", -} - -android_library_import { - name: "drc-lib-firebase-installations-16.3.5", - aars: ["firebase-installations-16.3.5.aar"], - sdk_version: "current", -} - -android_library_import { - name: "drc-lib-firebase-installations-interop-16.0.1", - aars: ["firebase-installations-interop-16.0.1.aar"], - sdk_version: "current", -} - -java_import { - name: "drc_static_libs", - jars: [ - "google-api-client-1.30.10.jar", - "google-http-client-1.36.0.jar", - "google-http-client-jackson2-1.36.0.jar", - "google-oauth-client-1.31.0.jar", - "httpclient-4.5.12.jar", - "httpcore-4.4.13.jar", - "jackson-core-2.11.1.jar", - "okhttp-2.7.2.jar", - "okio-1.6.0.jar", - "opencensus-api-0.24.0.jar", - "opencensus-contrib-http-util-0.24.0.jar", - ], - sdk_version: "current" -}
\ No newline at end of file diff --git a/libs/firebase-components-16.1.0.aar b/libs/firebase-components-16.1.0.aar Binary files differdeleted file mode 100644 index fafb519..0000000 --- a/libs/firebase-components-16.1.0.aar +++ /dev/null diff --git a/libs/firebase-functions-16.1.0.aar b/libs/firebase-functions-16.1.0.aar Binary files differdeleted file mode 100644 index 89431dd..0000000 --- a/libs/firebase-functions-16.1.0.aar +++ /dev/null diff --git a/libs/firebase-installations-16.3.5.aar b/libs/firebase-installations-16.3.5.aar Binary files differdeleted file mode 100644 index 6236f43..0000000 --- a/libs/firebase-installations-16.3.5.aar +++ /dev/null diff --git a/libs/firebase-installations-interop-16.0.1.aar b/libs/firebase-installations-interop-16.0.1.aar Binary files differdeleted file mode 100644 index 3dd9a6c..0000000 --- a/libs/firebase-installations-interop-16.0.1.aar +++ /dev/null diff --git a/libs/google-api-client-1.30.10.jar b/libs/google-api-client-1.30.10.jar Binary files differdeleted file mode 100644 index 20f26d2..0000000 --- a/libs/google-api-client-1.30.10.jar +++ /dev/null diff --git a/libs/google-http-client-1.36.0.jar b/libs/google-http-client-1.36.0.jar Binary files differdeleted file mode 100644 index 769ce23..0000000 --- a/libs/google-http-client-1.36.0.jar +++ /dev/null diff --git a/libs/google-http-client-jackson2-1.36.0.jar b/libs/google-http-client-jackson2-1.36.0.jar Binary files differdeleted file mode 100644 index a839e66..0000000 --- a/libs/google-http-client-jackson2-1.36.0.jar +++ /dev/null diff --git a/libs/google-oauth-client-1.31.0.jar b/libs/google-oauth-client-1.31.0.jar Binary files differdeleted file mode 100644 index f8aeca5..0000000 --- a/libs/google-oauth-client-1.31.0.jar +++ /dev/null diff --git a/libs/httpclient-4.5.12.jar b/libs/httpclient-4.5.12.jar Binary files differdeleted file mode 100644 index 300cdf0..0000000 --- a/libs/httpclient-4.5.12.jar +++ /dev/null diff --git a/libs/httpcore-4.4.13.jar b/libs/httpcore-4.4.13.jar Binary files differdeleted file mode 100644 index 163dc43..0000000 --- a/libs/httpcore-4.4.13.jar +++ /dev/null diff --git a/libs/jackson-core-2.11.1.jar b/libs/jackson-core-2.11.1.jar Binary files differdeleted file mode 100644 index 51b8c98..0000000 --- a/libs/jackson-core-2.11.1.jar +++ /dev/null diff --git a/libs/okhttp-2.7.2.jar b/libs/okhttp-2.7.2.jar Binary files differdeleted file mode 100644 index 9150647..0000000 --- a/libs/okhttp-2.7.2.jar +++ /dev/null diff --git a/libs/okio-1.6.0.jar b/libs/okio-1.6.0.jar Binary files differdeleted file mode 100644 index c87be59..0000000 --- a/libs/okio-1.6.0.jar +++ /dev/null diff --git a/libs/opencensus-api-0.24.0.jar b/libs/opencensus-api-0.24.0.jar Binary files differdeleted file mode 100644 index dcace99..0000000 --- a/libs/opencensus-api-0.24.0.jar +++ /dev/null diff --git a/libs/opencensus-contrib-http-util-0.24.0.jar b/libs/opencensus-contrib-http-util-0.24.0.jar Binary files differdeleted file mode 100644 index 4f91a71..0000000 --- a/libs/opencensus-contrib-http-util-0.24.0.jar +++ /dev/null diff --git a/soong/AndroidManifest.xml b/soong/AndroidManifest.xml deleted file mode 100644 index ab8f694..0000000 --- a/soong/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.car.debuggingrestrictioncontroller"> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.MANAGE_USERS" /> - - <application - android:name=".FirebaseApplication" - android:allowBackup="true" - android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" - android:supportsRtl="true" - android:theme="@style/Theme.DebuggingRestrictionController"> - - <activity - android:name=".ui.login.LoginActivity" - android:exported="true" - android:label="@string/app_name" - android:launchMode="singleTask"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - <activity - android:name=".ui.token.TokenActivity" - android:exported="false" - android:parentActivityName=".ui.login.LoginActivity"> - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value=".ui.login.LoginActivity" /> - </activity> - </application> - -</manifest> diff --git a/soong/BuildConfig.java b/soong/BuildConfig.java deleted file mode 100644 index 5f7c83c..0000000 --- a/soong/BuildConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.car.debuggingrestrictioncontroller; - -public final class BuildConfig { - - /** Toggle if the app should use a CA cert provided below */ - public static final boolean TOKEN_USES_SELF_SIGNED_CA = true; - - /** Contents of the self-signed CA root cert in PEM format */ - public static final String ROOT_CA_CERT = "[please specify]"; - - /** Name of the Token Issuer API, e.g. "requestAccessToken" */ - public static final String TOKEN_ISSUER_API_NAME = "[please specify]"; - - /** Exptected Hostname/SNI in the token signing certificate */ - public static final String TOKEN_ISSUER_HOST_NAME = "[please specify]"; - - /** Test account for instrumented tests */ - public static final String DRC_TEST_EMAIL = "[please specify]"; - - /** Test account for instrumented tests */ - public static final String DRC_TEST_PASSWORD = "[please specify]"; -} diff --git a/soong/FirebaseApplication.java b/soong/FirebaseApplication.java deleted file mode 100644 index 96860ca..0000000 --- a/soong/FirebaseApplication.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.car.debuggingrestrictioncontroller; - -import android.app.Application; -import com.google.firebase.FirebaseApp; -import com.google.firebase.FirebaseOptions; - -/** Firebase credentials */ -public class FirebaseApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - FirebaseOptions options = - new FirebaseOptions.Builder() - .setApplicationId("[please specify]") - .setProjectId("[please specify]") - .setApiKey("[please specify]") - .build(); - FirebaseApp.initializeApp(this, options); - } -} diff --git a/soong/README.md b/soong/README.md deleted file mode 100644 index a0da3bd..0000000 --- a/soong/README.md +++ /dev/null @@ -1,7 +0,0 @@ -The files in this directory are for building the app in the Android source tree. - -`FirebaseApplication.java` contains Firebase credentials that should be copied -from `google-services.json`, which can be downloaded from the Firebase console. - -`BuildConfig.java` contains configuratuon for the root CA certificate and the -token issuer API endpoint. |