diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-28 08:22:10 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-28 08:22:10 +0000 |
commit | c8bf0869f15a0e326d72cde41c9e9c8bfb7209cf (patch) | |
tree | 3ee81bb63dbae3ee5d4f8f56390a4ef77a22092f | |
parent | a49d9f7bc67d6b96e65dd9af649d340b0ca596e3 (diff) | |
parent | acdbc8688e23b39ff311b4b554be3547a47245a3 (diff) | |
download | gatekeeper-c8bf0869f15a0e326d72cde41c9e9c8bfb7209cf.tar.gz |
Snap for 4625912 from acdbc8688e23b39ff311b4b554be3547a47245a3 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r5android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1pie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release
Change-Id: Ib1e14757fa881aba7860da992cc3424400b4e63b
-rw-r--r-- | tests/Android.bp | 37 | ||||
-rw-r--r-- | tests/Android.mk | 29 |
2 files changed, 37 insertions, 29 deletions
diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..2dcfc8b --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,37 @@ +// +// 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: "gatekeeper-unit-tests", + + cflags: [ + "-g", + "-Wall", + "-Werror", + "-Wno-missing-field-initializers", + ], + + shared_libs: [ + "libgatekeeper", + "libcrypto", + "libhardware", + ], + static_libs: ["libscrypt_static"], + srcs: [ + "gatekeeper_messages_test.cpp", + "gatekeeper_device_test.cpp", + ], +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 7fbca99..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# 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 := gatekeeper-unit-tests -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libhardware -LOCAL_STATIC_LIBRARIES := libscrypt_static -LOCAL_C_INCLUDES := external/scrypt/lib/crypto -LOCAL_SRC_FILES := \ - gatekeeper_messages_test.cpp \ - gatekeeper_device_test.cpp -include $(BUILD_NATIVE_TEST) |