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

Commit dec8fbfc authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Revert "Add Java library to query state of VirtualCamera build flag." 

This reverts commit 51930176.

Reason for revert: Reverting in favor of approach in ag/26512506.

Change-Id: I63e12edd9a8e1dbb8b0dbf02738a02b25c54cfce
parent 51930176

services/camera/virtualcamera/flags/Android.bp

+0 −24
Original line number Diff line number Diff line
@@ -35,27 +35,3 @@ cc_library_static { 
    export_include_dirs: ["."],

    defaults: ["virtual_device_build_flags_defaults"],

}
 


soong_config_module_type {

    name: "virtual_device_build_flags_java_library",

    module_type: "java_library",

    config_namespace: "vdm",

    bool_variables: [

        "virtual_camera_service_enabled",

    ],

    properties: [

        "srcs",

    ],

}



virtual_device_build_flags_java_library {

    name: "virtual_device_build_flag_java",

    soong_config_variables: {

        virtual_camera_service_enabled: {

            srcs: ["java/enabled/**/*.java"],

            conditions_default: {

                srcs: ["java/disabled/**/*.java"],

            },

        },

    },

}

services/camera/virtualcamera/flags/java/disabled/android/companion/virtualdevice/flags/VirtualCameraServiceBuildFlag.java

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright 2024 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 android.companion.virtualdevice.flags;



/** This file is included only if RELEASE_PACKAGE_VIRTUAL_CAMERA build flag isn't set.*/

public class VirtualCameraServiceBuildFlag {



    public static boolean isVirtualCameraServiceBuildFlagEnabled() {

        return false;

    }

}

services/camera/virtualcamera/flags/java/enabled/android/companion/virtualdevice/flags/VirtualCameraServiceBuildFlag.java

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright 2024 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 android.companion.virtualdevice.flags;



/** This file is included only if RELEASE_PACKAGE_VIRTUAL_CAMERA build flag is set.*/

public class VirtualCameraServiceBuildFlag {



    public static boolean isVirtualCameraServiceBuildFlagEnabled() {

        return true;

    }

}