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

Commit 954b9825 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert screencap and libjni_pacprocessor to Android.bp"

parents 932f96b2 a13b003b

cmds/screencap/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
cc_binary {

    name: "screencap",



    srcs: ["screencap.cpp"],



    shared_libs: [

        "libcutils",

        "libutils",

        "libbinder",

        "libhwui",

        "libui",

        "libgui",

    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

cmds/screencap/Android.mk

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

include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    screencap.cpp



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libutils \

    libbinder \

    libhwui \

    libui \

    libgui



LOCAL_MODULE:= screencap



LOCAL_MODULE_TAGS := optional



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



include $(BUILD_EXECUTABLE)

packages/services/PacProcessor/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -29,5 +29,3 @@ LOCAL_CERTIFICATE := platform 
LOCAL_JNI_SHARED_LIBRARIES := libjni_pacprocessor libpac



include $(BUILD_PACKAGE)
 


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

packages/services/PacProcessor/jni/Android.bp

0 → 100644
+40 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2013 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_shared {

    name: "libjni_pacprocessor",



    srcs: [

        "jni_init.cpp",

        "com_android_pacprocessor_PacNative.cpp",

    ],



    shared_libs: [

        "libandroidfw",

        "libandroid_runtime",

        "liblog",

        "libutils",

        "libnativehelper",

        "libpac",

    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

packages/services/PacProcessor/jni/Android.mk

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
#

# Copyright (C) 2013 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 := \

    jni_init.cpp \

    com_android_pacprocessor_PacNative.cpp



LOCAL_C_INCLUDES += \

    external/chromium-libpac/src



LOCAL_SHARED_LIBRARIES := \

    libandroidfw \

    libandroid_runtime \

    liblog \

    libutils \

    libnativehelper \

    libpac



LOCAL_MODULE := libjni_pacprocessor

LOCAL_MODULE_TAGS := optional



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



include $(BUILD_SHARED_LIBRARY)