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

Commit 81be10e8 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "otautil: Android.mk -> Android.bp" am: 106ca8e9 am: 46938bcf am: 09690020 

am: af47ef65

Change-Id: Ie877a72a379d62ba9db89d4cf83bdde64fea5971
parents d8a4e9e8 af47ef65

Android.bp

0 → 100644
+3 −0
Original line number Diff line number Diff line 
subdirs = [

    "otautil",

]

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ include \ 
    $(LOCAL_PATH)/minadbd/Android.mk \

    $(LOCAL_PATH)/minui/Android.mk \

    $(LOCAL_PATH)/otafault/Android.mk \

    $(LOCAL_PATH)/otautil/Android.mk \

    $(LOCAL_PATH)/tests/Android.mk \

    $(LOCAL_PATH)/tools/Android.mk \

    $(LOCAL_PATH)/uncrypt/Android.mk \

otautil/Android.bp

0 → 100644
+34 −0
Original line number Diff line number Diff line 
// Copyright (C) 2016 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: "libotautil",



    srcs: [

        "SysUtil.cpp",

        "DirUtil.cpp",

        "ZipUtil.cpp",

        "ThermalUtil.cpp",

    ],



    static_libs: [

        "libselinux",

        "libbase",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],

}

otautil/Android.mk

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
# Copyright (C) 2016 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_SRC_FILES := \

    SysUtil.cpp \

    DirUtil.cpp \

    ZipUtil.cpp \

    ThermalUtil.cpp



LOCAL_STATIC_LIBRARIES := \

    libselinux \

    libbase



LOCAL_MODULE := libotautil

LOCAL_CFLAGS := \

    -Werror \

    -Wall



include $(BUILD_STATIC_LIBRARY)