summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Onorato <joeo@google.com> 2023-08-19 19:49:52 -0700
committer Joe Onorato <joeo@google.com> 2023-08-20 07:47:33 -0700
commitcd77947bd9869a0f1834a9ee1b83c509515006e0 (patch)
tree5dca758fcb8a1c3d6b09edb90746de4b7f57bd3d
parente1ee1aab9f99d05ca97dee3701afb894a6129446 (diff)
Add first aconfig library inside the framework.
The difficult part here is that the aconfig libraries can't be compiled separately from the framework, so the framework adds a srcjar and we add a fake DeviceConfig so that the generated libraries will compile. Bug: 293195086 Test: m Change-Id: Ia54cb5d1196f9579f418586a0c53b8846d46dc5a
-rw-r--r--AconfigFlags.bp43
-rw-r--r--Android.bp2
-rw-r--r--core/java/android/hardware/camera2/camera_platform.aconfig8
3 files changed, 53 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
new file mode 100644
index 000000000000..16907b3432ec
--- /dev/null
+++ b/AconfigFlags.bp
@@ -0,0 +1,43 @@
+// Copyright (C) 2023 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.
+
+// Aconfig declarations and libraries for the core framework
+java_defaults {
+ name: "framework-minus-apex-aconfig-libraries",
+
+ // Add java_aconfig_libraries to here to add them to the core framework
+ srcs: [
+ ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
+ ],
+}
+
+// Default flags for java_aconfig_libraries that go into framework-minus-apex
+// These libraries will not work standalone
+java_defaults {
+ name: "framework-minus-apex-aconfig-java-defaults",
+ sdk_version: "core_platform",
+ libs: ["fake_device_config"],
+}
+
+aconfig_declarations {
+ name: "com.android.hardware.camera2-aconfig",
+ package: "com.android.hardware.camera2",
+ srcs: ["core/java/android/hardware/camera2/camera_platform.aconfig"],
+}
+
+java_aconfig_library {
+ name: "com.android.hardware.camera2-aconfig-java",
+ aconfig_declarations: "com.android.hardware.camera2-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
diff --git a/Android.bp b/Android.bp
index 94bcb3ef04c8..274c430169f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -263,6 +263,7 @@ java_defaults {
defaults: [
"framework-aidl-export-defaults",
"latest_android_hardware_soundtrigger3_java_static",
+ "framework-minus-apex-aconfig-libraries",
],
srcs: [
":framework-non-updatable-sources",
@@ -611,6 +612,7 @@ stubs_defaults {
}
build = [
+ "AconfigFlags.bp",
"ProtoLibraries.bp",
"TestProtoLibraries.bp",
]
diff --git a/core/java/android/hardware/camera2/camera_platform.aconfig b/core/java/android/hardware/camera2/camera_platform.aconfig
new file mode 100644
index 000000000000..67f63001ab58
--- /dev/null
+++ b/core/java/android/hardware/camera2/camera_platform.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.hardware.camera2"
+
+flag {
+ namespace: "camera_platform"
+ name: "initial_test_flag"
+ description: "Flag infrastructure test flag"
+ bug: "292631208"
+}