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

Commit 1dcd257a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "trusty/storage/* to Android.bp"

parents 7b706c5b 7f0a5bd7

trusty/Android.bp

+1 −0
Original line number Diff line number Diff line 
subdirs = [

    "libtrusty",

    "storage/*",

]

trusty/storage/interface/Android.bp

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

// Copyright (C) 2015 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_static {

    name: "libtrustystorageinterface",

    export_include_dirs: ["include"],

}

trusty/storage/interface/Android.mk

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

# Copyright (C) 2015 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_MODULE := libtrustystorageinterface



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



include $(BUILD_STATIC_LIBRARY)

trusty/storage/lib/Android.bp

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

// Copyright (C) 2015 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_static {

    name: "libtrustystorage",



    srcs: ["storage.c"],



    export_include_dirs: ["include"],



    static_libs: [

        "liblog",

        "libtrusty",

        "libtrustystorageinterface",

    ],



    cflags: [

        "-fvisibility=hidden",

        "-Wall",

        "-Werror",

    ]

}

trusty/storage/lib/Android.mk

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

# Copyright (C) 2015 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_MODULE := libtrustystorage



LOCAL_SRC_FILES := \

	storage.c \



LOCAL_CLFAGS = -fvisibility=hidden -Wall -Werror



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include



LOCAL_STATIC_LIBRARIES := \

	liblog \

	libtrusty \

	libtrustystorageinterface



include $(BUILD_STATIC_LIBRARY)