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

Commit 3beec54b authored by nelsonli's avatar nelsonli
Browse files

[vts-core] Remove extra folder for vts_core_liblp_test and vts_libdm_test 

Remove the extra folder of vts_core for vts_core_liblp_test and
vts_libdm_test since we have a better auto-gen option of auto_gen_config.

Bug: 141684102
Test: 1. m -j vts_core_liblp_test
      2. m -j vts_libdm_test
      3. check out/.../vts_core_liblp_test.config
         and
         out/.../vts_libdm_test.config

Change-Id: Ibcdf96104205b50b3da522364199330ad0190c70
parent 3edff134

fs_mgr/libdm/Android.bp

+10 −7
Original line number Diff line number Diff line
@@ -55,13 +55,7 @@ filegroup { 


cc_defaults {

    name: "libdm_defaults",

    sanitize: {

        misc_undefined: ["integer"],

    },

    cflags: [

        "-Wall",

        "-Werror",

    ],

    defaults: ["fs_mgr_defaults"],

    static_libs: [

        "libdm",

        "libbase",
@@ -76,3 +70,12 @@ cc_test { 
    name: "libdm_test",

    defaults: ["libdm_defaults"],

}



cc_test {

    name: "vts_libdm_test",

    defaults: ["libdm_defaults"],

    test_suites: ["vts-core"],

    auto_gen_config: true,

    require_root: true,

    test_min_api_level: 29,

}

fs_mgr/libdm/vts_core/Android.bp

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
//

// Copyright (C) 2019 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.

//



cc_test {

    name: "vts_libdm_test",

    defaults: ["libdm_defaults"],

    test_suites: ["vts-core"],

    require_root: true,

    test_min_api_level: 29,

}

fs_mgr/liblp/Android.bp

+9 −7
Original line number Diff line number Diff line
@@ -69,13 +69,7 @@ filegroup { 


cc_defaults {

    name: "liblp_test_defaults",

    sanitize: {

        misc_undefined: ["integer"],

    },

    cflags: [

        "-Wall",

        "-Werror",

    ],

    defaults: ["fs_mgr_defaults"],

    cppflags: [

        "-Wno-unused-parameter",

    ],
@@ -100,6 +94,14 @@ cc_test { 
    test_suites: ["device-tests"],

}



cc_test {

    name: "vts_core_liblp_test",

    defaults: ["liblp_test_defaults"],

    test_suites: ["vts-core"],

    auto_gen_config: true,

    test_min_api_level: 29,

}



cc_test {

    name: "vts_kernel_liblp_test",

    defaults: ["liblp_test_defaults"],

fs_mgr/liblp/vts_core/Android.bp

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
//

// Copyright (C) 2019 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.

//



cc_test {

    name: "vts_core_liblp_test",

    defaults: ["liblp_test_defaults"],

    test_suites: ["vts-core"],

    test_min_api_level: 29,

}