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

Commit 333de839 authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

Merge "Revert "Revert "Remove libfiemap_writer from fs_mgr and move it to... 

Merge "Revert "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid.""" am: eb599db1 am: 90478358
am: 09a959f1

Change-Id: Ibb7071de2cdaa8429b239d52a7b6071911f6ffc5
parents dc40a5e9 09a959f1

fs_mgr/libfiemap_writer/.clang-format

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../.clang-format-4
 
 No newline at end of file

fs_mgr/libfiemap_writer/Android.bp

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

// Copyright (C) 2018 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_library_static {

    name: "libfiemap_writer",

    defaults: ["fs_mgr_defaults"],

    recovery_available: true,

    export_include_dirs: ["include"],

    cflags: [

        "-D_FILE_OFFSET_BITS=64",

    ],



    srcs: [

        "fiemap_writer.cpp",

        "split_fiemap_writer.cpp",

        "utility.cpp",

    ],



    static_libs: [

        "libdm",

        "libext4_utils",

    ],



    header_libs: [

        "libbase_headers",

        "liblog_headers",

    ],

}



cc_test {

    name: "fiemap_writer_test",

    cflags: [

        "-D_FILE_OFFSET_BITS=64",

    ],

    static_libs: [

        "libbase",

        "libdm",

        "libfiemap_writer",

        "liblog",

    ],



    data: [

        "testdata/unaligned_file",

        "testdata/file_4k",

        "testdata/file_32k",

    ],



    srcs: [

        "fiemap_writer_test.cpp",

    ],

}

fs_mgr/libfiemap_writer/Android.mk

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.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := VtsFiemapWriterTest

-include test/vts/tools/build/Android.host_config.mk

fs_mgr/libfiemap_writer/AndroidTest.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<configuration description="Config for VTS VtsFiemapWriterTest">

    <option name="config-descriptor:metadata" key="plan" value="vts-kernel" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">

        <option name="abort-on-push-failure" value="false"/>

        <option name="push-group" value="HostDrivenTest.push"/>

    </target_preparer>

    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

      <option name="test-module-name" value="VtsFiemapWriterTest"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/fiemap_writer_test/fiemap_writer_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/fiemap_writer_test/fiemap_writer_test" />

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="1m"/>

    </test>

</configuration>