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

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

Merge "libtrusty: Android.mk -> Android.bp"

parents 59c74a3b f304a205

trusty/Android.bp

0 → 100644
+3 −0
Original line number Diff line number Diff line 
subdirs = [

    "libtrusty",

]

trusty/libtrusty/Android.bp

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



subdirs = [

    "tipc-test",

]



cc_library {

    name: "libtrusty",



    srcs: ["trusty.c"],

    export_include_dirs: ["include"],



    shared_libs: ["liblog"],

}

trusty/libtrusty/Android.mk

deleted100644 → 0
+0 −36
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)



# == libtrusty Static library ==

include $(CLEAR_VARS)



LOCAL_MODULE := libtrusty

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := trusty.c

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



include $(BUILD_STATIC_LIBRARY)



# ==  libtrusty shared library ==

include $(CLEAR_VARS)



LOCAL_MODULE := libtrusty

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := trusty.c

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_SHARED_LIBRARIES := liblog



include $(BUILD_SHARED_LIBRARY)

trusty/libtrusty/tipc-test/Android.bp

0 → 100644
+26 −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_test {

    name: "tipc-test",

    static_executable: true,



    srcs: ["tipc_test.c"],

    static_libs: [

        "libc",

        "libtrusty",

        "liblog",

    ],

    gtest: false,

}

trusty/libtrusty/tipc-test/Android.mk

deleted100644 → 0
+0 −29
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 := tipc-test

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := tipc_test.c

LOCAL_STATIC_LIBRARIES := libc libtrusty liblog

LOCAL_MULTILIB := both

LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32

LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64



include $(BUILD_EXECUTABLE)