Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 726f7f90 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add first aconfig library inside the framework." into main am:... 

Merge "Add first aconfig library inside the framework." into main am: 273f2e90 am: 53845fff am: 3f0c0b34 am: 2ebfc02f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2718853



Change-Id: I2918f35daf69c6c721038f08450b05e686a33334
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0d65b29 2ebfc02f

AconfigFlags.bp

0 → 100644
+43 −0
Original line number Original line Diff line number Diff line 
// 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"],

}

Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -269,6 +269,7 @@ java_defaults { 
    defaults: [

    defaults: [

        "framework-aidl-export-defaults",

        "framework-aidl-export-defaults",

        "latest_android_hardware_soundtrigger3_java_static",

        "latest_android_hardware_soundtrigger3_java_static",

        "framework-minus-apex-aconfig-libraries",

    ],

    ],

    srcs: [

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-non-updatable-sources",
@@ -689,6 +690,7 @@ stubs_defaults { 
}

}





build = [

build = [

    "AconfigFlags.bp",

    "ProtoLibraries.bp",

    "ProtoLibraries.bp",

    "TestProtoLibraries.bp",

    "TestProtoLibraries.bp",

]
 
]

core/java/android/hardware/camera2/camera_platform.aconfig

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
package: "com.android.hardware.camera2"



flag {

     namespace: "camera_platform"

     name: "initial_test_flag"

     description: "Flag infrastructure test flag"

     bug: "292631208"

}