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

Commit 8a78c90a authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Switch some build tools to Soong"

am: c52d09e6

* commit 'c52d09e6':
  Switch some build tools to Soong

Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
parents d1f0eb15 c52d09e6
Loading
Loading
Loading
Loading

libs/host/Android.bp

0 → 100644
+20 −0
Original line number Diff line number Diff line
cc_library_host_static {

    srcs: ["CopyFile.c"],

    cflags: [
        "-Werror",
        "-Wall",
    ],

    name: "libhost",
    target: {
        windows: {
            enabled: true,
        },
    },
    local_include_dirs: ["include"],
    export_include_dirs: ["include"],
    stl: "none",

}

libs/host/Android.mk

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    CopyFile.c

LOCAL_CFLAGS := -Werror -Wall

LOCAL_MODULE:= libhost
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CXX_STL := none

include $(BUILD_HOST_STATIC_LIBRARY)

# Include toolchain prebuilt modules if they exist.
-include $(TARGET_TOOLCHAIN_ROOT)/toolchain.mk

tools/acp/Android.bp

0 → 100644
+13 −0
Original line number Diff line number Diff line
// Copyright 2005 The Android Open Source Project
//
// Custom version of cp.

cc_binary_host {

    srcs: ["acp.c"],

    static_libs: ["libhost"],
    name: "acp",
    stl: "none",

}

tools/acp/Android.mk

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line
# Copyright 2005 The Android Open Source Project
#
# Custom version of cp.

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := \
    acp.c

LOCAL_STATIC_LIBRARIES := libhost
LOCAL_MODULE := acp
LOCAL_CXX_STL := none

include $(BUILD_HOST_EXECUTABLE)

tools/ijar/Android.bp

0 → 100644
+20 −0
Original line number Diff line number Diff line
// Copyright 2015 The Android Open Source Project
//
// The rest of files in this directory comes from
// https://github.com/bazelbuild/bazel/tree/master/third_party/ijar

cc_binary_host {
    srcs: [
        "classfile.cc",
        "ijar.cc",
        "zip.cc",
    ],
    cflags: [
        "-Wall",
        "-Werror",
    ],
    host_ldlibs: ["-lz"],
    name: "ijar",
    // libc++ is not supported for TARGET_BUILD_APPS builds
    stl: "libstdc++",
}
Loading