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

Commit ce2221e0 authored by Colin Cross's avatar Colin Cross
Browse files

Convert libandroidfw to Android.bp 

See build/soong/README.md for more information.

Test: libandroidfw_tests
Merged-In: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
Change-Id: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
(cherry picked from commit 4f8d9e69)
parent c60963e4

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



subdirs = [

    "libs/*",

    "native/android",

    "native/graphics/jni",

]

libs/androidfw/Android.bp

0 → 100644
+73 −0
Original line number Diff line number Diff line 
// Copyright (C) 2010 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.



// libandroidfw is partially built for the host (used by obbtool, aapt, and others)



cc_library {

    name: "libandroidfw",

    host_supported: true,

    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

    srcs: [

        "Asset.cpp",

        "AssetDir.cpp",

        "AssetManager.cpp",

        "LocaleData.cpp",

        "misc.cpp",

        "ObbFile.cpp",

        "ResourceTypes.cpp",

        "StreamingZipInflater.cpp",

        "TypeWrappers.cpp",

        "ZipFileRO.cpp",

        "ZipUtils.cpp",

    ],

    export_include_dirs: ["include"],

    target: {

        android: {

            srcs: [

                "BackupData.cpp",

                "BackupHelpers.cpp",

                "CursorWindow.cpp",

                "DisplayEventDispatcher.cpp",

            ],

            shared_libs: [

                "libziparchive",

                "libbase",

                "libbinder",

                "liblog",

                "libcutils",

                "libgui",

                "libutils",

                "libz",

            ],

            static: {

                enabled: false,

            },

        },

        host: {

            cflags: ["-DSTATIC_ANDROIDFW_FOR_TOOLS"],

            shared: {

                enabled: false,

            },

            shared_libs: ["libz-host"],

        },

        windows: {

            enabled: true,

        },

    },

}

libs/androidfw/Android.mk

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
# Copyright (C) 2010 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)



# libandroidfw is partially built for the host (used by obbtool, aapt, and others)

# These files are common to host and target builds.



commonSources := \

    Asset.cpp \

    AssetDir.cpp \

    AssetManager.cpp \

    LocaleData.cpp \

    misc.cpp \

    ObbFile.cpp \

    ResourceTypes.cpp \

    StreamingZipInflater.cpp \

    TypeWrappers.cpp \

    ZipFileRO.cpp \

    ZipUtils.cpp



deviceSources := \

    $(commonSources) \

    BackupData.cpp \

    BackupHelpers.cpp \

    CursorWindow.cpp \

    DisplayEventDispatcher.cpp



hostSources := $(commonSources)



# For the host

# =====================================================

include $(CLEAR_VARS)



LOCAL_MODULE:= libandroidfw

LOCAL_MODULE_HOST_OS := darwin linux windows

LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS

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

LOCAL_SRC_FILES:= $(hostSources)

LOCAL_C_INCLUDES := external/zlib

LOCAL_C_INCLUDES += $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



include $(BUILD_HOST_STATIC_LIBRARY)





# For the device

# =====================================================



include $(CLEAR_VARS)



LOCAL_MODULE:= libandroidfw

LOCAL_SRC_FILES:= $(deviceSources)

LOCAL_C_INCLUDES := \

    system/core/include

LOCAL_SHARED_LIBRARIES := \

    libziparchive \

    libbase \

    libbinder \

    liblog \

    libcutils \

    libgui \

    libutils \

    libz



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES += $(LOCAL_PATH)/include

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



include $(BUILD_SHARED_LIBRARY)





# Include subdirectory makefiles

# ============================================================



# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework

# team really wants is to build the stuff defined by this makefile.

ifeq (,$(ONE_SHOT_MAKEFILE))

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

endif