diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-05 07:54:41 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-05 07:54:41 -0700 |
commit | b805514f31a231a0e78a18f296c0454fcadead1a (patch) | |
tree | f4b1f2464f4052dd58b91170c4766e0aebfc9d47 | |
parent | bba672d937d1f6f0ded8a69f9aec0e097cd2d236 (diff) | |
parent | 5d44089940a104eaf6c86fadd3414996bcc6af5b (diff) | |
download | safe-iop-oreo-mr1-1.2-iot-release.tar.gz |
Merge "Convert to Soong" am: 9dc8fe3aa0HEADandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releaseoreo-mr1-1.2-iot-releasenougat-iot-releasemastermainbuild-tools-release
am: 5d44089940
Change-Id: I3c85f7c9bc13bcd814c27e3650e5d82ec6b4d554
-rw-r--r-- | Android.bp | 41 | ||||
-rw-r--r-- | Android.mk | 32 | ||||
-rw-r--r-- | testsuite/Android.mk | 33 |
3 files changed, 41 insertions, 65 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..fa2f6b6 --- /dev/null +++ b/Android.bp @@ -0,0 +1,41 @@ +// Copyright (C) 2008 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: "libsafe_iop", + + export_include_dirs: ["include"], + + srcs: ["src/safe_iop.c"], + + cflags: [ + "-Wall", + "-Werror", + "-Wno-unused-parameter", + ], +} + +cc_test { + name: "safe_iop_test", + gtest: false, + local_include_dirs: ["include"], + srcs: ["src/safe_iop.c"], + cflags: [ + "-DSAFE_IOP_TEST=1", + "-DNDEBUG=1", + "-Wall", + "-Werror", + "-Wno-unused-parameter", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index f8d9c51..0000000 --- a/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2008 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_C_INCLUDES := \ - $(LOCAL_PATH)/include - -LOCAL_SRC_FILES := src/safe_iop.c - -LOCAL_CFLAGS := \ - -Wall -Werror \ - -Wno-unused-parameter \ - -LOCAL_MODULE := libsafe_iop - -include $(BUILD_STATIC_LIBRARY) - -include $(LOCAL_PATH)/testsuite/Android.mk diff --git a/testsuite/Android.mk b/testsuite/Android.mk deleted file mode 100644 index 0cb820c..0000000 --- a/testsuite/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2008 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_C_INCLUDES := \ - $(LOCAL_PATH)/../include - -# TODO: make the test use the compiled static lib. -LOCAL_SRC_FILES := ../src/safe_iop.c -LOCAL_CFLAGS := \ - -DSAFE_IOP_TEST=1 -DNDEBUG=1 \ - -Wall -Werror \ - -Wno-unused-parameter \ - -LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE := safe_iop_test - -include $(BUILD_EXECUTABLE) |