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

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

Merge "Convert to Soong" am: acbd94d7 am: b1005a8a 

am: d00c851e

Change-Id: I889b5d31535d927b3aa9cf5ad6af955ca0678356
parents acc0043a d00c851e

apct-tests/perftests/core/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -27,5 +27,3 @@ LOCAL_ASSET_DIR := $(TOP)/external/google-fonts/dancing-script 
LOCAL_COMPATIBILITY_SUITE += device-tests



include $(BUILD_PACKAGE)
 


include $(call all-makefiles-under, $(LOCAL_PATH))

apct-tests/perftests/core/jni/Android.bp

0 → 100644
+13 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libperftestscore_jni",

    sdk_version: "21",



    srcs: ["SystemPerfTest.cpp"],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

apct-tests/perftests/core/jni/Android.mk

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



include $(CLEAR_VARS)

LOCAL_SDK_VERSION := 21



LOCAL_SRC_FILES:= \

    SystemPerfTest.cpp \



LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE)



LOCAL_MODULE := libperftestscore_jni

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)

cmds/idmap/Android.bp

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



    srcs: [

        "idmap.cpp",

        "create.cpp",

        "scan.cpp",

        "inspect.cpp",

    ],



    shared_libs: [

        "liblog",

        "libutils",

        "libandroidfw",

        "libcutils",

    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

cmds/idmap/Android.mk

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
# Copyright (C) 2012 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 := idmap.cpp create.cpp scan.cpp inspect.cpp



LOCAL_SHARED_LIBRARIES := liblog libutils libandroidfw libcutils



LOCAL_MODULE := idmap



LOCAL_C_INCLUDES := external/zlib



LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_EXECUTABLE)