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

Commit 0332a439 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Convert more modules to Android.bp" am: 2141f9a6 am: 0baa61fa

am: aa89dda2

Change-Id: I76411d57229c599dbbf4a86215e2b0c492b5612c
parents 54be99f2 aa89dda2
Loading
Loading
Loading
Loading

cpio/Android.bp

0 → 100644
+8 −0
Original line number Diff line number Diff line
// Copyright 2005 The Android Open Source Project

cc_binary_host {
    name: "mkbootfs",
    srcs: ["mkbootfs.c"],
    cflags: ["-Werror"],
    shared_libs: ["libcutils"],
}
+1 −15
Original line number Diff line number Diff line
# Copyright 2005 The Android Open Source Project

LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_SRC_FILES := \
	mkbootfs.c

LOCAL_MODULE := mkbootfs

LOCAL_CFLAGS := -Werror

LOCAL_SHARED_LIBRARIES := libcutils

include $(BUILD_HOST_EXECUTABLE)

$(call dist-for-goals,dist_files,$(LOCAL_BUILT_MODULE))
$(call dist-for-goals,dist_files,$(ALL_MODULES.mkbootfs.BUILT))

gatekeeperd/Android.bp

0 → 100644
+50 −0
Original line number Diff line number Diff line
//
// Copyright (C) 2015 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_binary {
    name: "gatekeeperd",
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-Wunused",
    ],
    srcs: [
        "SoftGateKeeperDevice.cpp",
        "IGateKeeperService.cpp",
        "gatekeeperd.cpp",
    ],

    shared_libs: [
        "libbinder",
        "libgatekeeper",
        "liblog",
        "libhardware",
        "libbase",
        "libutils",
        "libcrypto",
        "libkeystore_aidl",
        "libkeystore_binder",
        "libhidlbase",
        "libhidltransport",
        "libhwbinder",
        "android.hardware.gatekeeper@1.0",
    ],

    static_libs: ["libscrypt_static"],
    include_dirs: ["external/scrypt/lib/crypto"],
    init_rc: ["gatekeeperd.rc"],
}

gatekeeperd/Android.mk

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line
#
# Copyright (C) 2015 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_CFLAGS := -Wall -Wextra -Werror -Wunused
LOCAL_SRC_FILES := \
	SoftGateKeeperDevice.cpp \
	IGateKeeperService.cpp \
	gatekeeperd.cpp

LOCAL_MODULE := gatekeeperd
LOCAL_SHARED_LIBRARIES := \
	libbinder \
	libgatekeeper \
	liblog \
	libhardware \
	libbase \
	libutils \
	libcrypto \
	libkeystore_aidl \
	libkeystore_binder \
	libhidlbase \
	libhidltransport \
	libhwbinder \
	android.hardware.gatekeeper@1.0 \

LOCAL_STATIC_LIBRARIES := libscrypt_static
LOCAL_C_INCLUDES := external/scrypt/lib/crypto
LOCAL_INIT_RC := gatekeeperd.rc
include $(BUILD_EXECUTABLE)

include $(call first-makefiles-under,$(LOCAL_PATH))
+34 −0
Original line number Diff line number Diff line
//
// Copyright (C) 2015 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: "gatekeeperd-unit-tests",

    cflags: [
        "-g",
        "-Wall",
        "-Werror",
        "-Wno-missing-field-initializers",
    ],
    shared_libs: [
        "libgatekeeper",
        "libcrypto",
        "libbase",
    ],
    static_libs: ["libscrypt_static"],
    include_dirs: ["external/scrypt/lib/crypto"],
    srcs: ["gatekeeper_test.cpp"],
}
Loading