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

Commit 106ca8e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "otautil: Android.mk -> Android.bp"

parents c0084856 f3ae55a1
Loading
Loading
Loading
Loading

Android.bp

0 → 100644
+3 −0
Original line number Diff line number Diff line
subdirs = [
    "otautil",
]
+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)