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

Commit 83c64e6b authored by Mathias Agopian's avatar Mathias Agopian
Browse files

frameworks/base refactoring 

create the new libandroidfw from parts of libui and libutils

Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
parent 94d00245

cmds/backup/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:= backup.cpp



LOCAL_SHARED_LIBRARIES := libcutils libutils

LOCAL_SHARED_LIBRARIES := libcutils libutils libandroidfw



LOCAL_MODULE:= btool

cmds/bootanimation/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 


LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libandroidfw \

	libutils \

	libbinder \

    libui \

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ LOCAL_C_INCLUDES += \ 
	libcore/include



LOCAL_SHARED_LIBRARIES := \

	libandroidfw \

	libexpat \

	libnativehelper \

	libcutils \

graphics/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libandroid_runtime \

        libandroidfw \

        libnativehelper \

        libRS \

        libcutils \

libs/androidfw/Android.mk

0 → 100644
+110 −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.



LOCAL_PATH:= $(call my-dir)



# libandroidfw is partially built for the host (used by build time keymap validation tool)

# These files are common to host and target builds.



# formerly in libutils

commonUtilsSources:= \

    Asset.cpp \

    AssetDir.cpp \

    AssetManager.cpp \

    ObbFile.cpp \

    ResourceTypes.cpp \

    StreamingZipInflater.cpp \

    ZipFileCRO.cpp \

    ZipFileRO.cpp \

    ZipUtils.cpp



# formerly in libui

commonUiSources:= \

    Input.cpp \

    Keyboard.cpp \

    KeyCharacterMap.cpp \

    KeyLayoutMap.cpp \

    VirtualKeyMap.cpp



commonSources:= \

	$(commonUtilsSources) \

	$(commonUiSources)



# For the host

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



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= $(commonSources)



LOCAL_MODULE:= libandroidfw



LOCAL_MODULE_TAGS := optional



include $(BUILD_HOST_STATIC_LIBRARY)





# For the device

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



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	$(commonSources) \

	BackupData.cpp \

	BackupHelpers.cpp \

	InputTransport.cpp



LOCAL_SHARED_LIBRARIES := \

	liblog \

	libcutils \

	libutils \

	libbinder \

	libskia \

	libz



LOCAL_C_INCLUDES := \

    external/skia/include/core \

    external/icu4c/common \

	external/zlib



LOCAL_MODULE:= libandroidfw



LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)





ifeq ($(TARGET_OS),linux)

include $(CLEAR_VARS)

LOCAL_C_INCLUDES += \

	external/skia/include/core \

	external/zlib \

	external/icu4c/common \

	bionic/libc/private

LOCAL_LDLIBS := -lrt -ldl -lpthread

LOCAL_MODULE := libutils

LOCAL_SRC_FILES := $(commonUtilsSources) BackupData.cpp BackupHelpers.cpp

include $(BUILD_STATIC_LIBRARY)

endif





# 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