diff options
| author | Yuntao Xu <yuntaoxu@google.com> | 2021-11-02 19:27:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 19:27:22 +0000 |
| commit | b45b567a47911711d898868cdf43c258764b6588 (patch) | |
| tree | affea032969e2467c5c9c5c5aecfde4ebac8e444 | |
| parent | 42da1c3b6c9b5e37e138c8b470ce8d817720084d (diff) | |
| parent | 001a6fccde37b82231d8ecd582f15e748e45fe89 (diff) | |
| download | v4l2_codec2-b45b567a47911711d898868cdf43c258764b6588.tar.gz | |
Merge "Convert jni/Android.mk to Android.bp" am: 01b8e3e9b2 am: 4bcb423095 am: 756d190e0d am: 001a6fccde
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1869664
Change-Id: I417e451c05bf7aa442e88ea0f87cc3a21475a03e
| -rw-r--r-- | tests/c2_e2e_test/jni/Android.bp | 36 | ||||
| -rw-r--r-- | tests/c2_e2e_test/jni/Android.mk | 42 |
2 files changed, 36 insertions, 42 deletions
diff --git a/tests/c2_e2e_test/jni/Android.bp b/tests/c2_e2e_test/jni/Android.bp new file mode 100644 index 0000000..7507c30 --- /dev/null +++ b/tests/c2_e2e_test/jni/Android.bp @@ -0,0 +1,36 @@ +// Copyright 2019 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "external_v4l2_codec2_license", + ], +} + +cc_library_shared { + name: "libcodectest", + srcs: [ + "video_encoder_e2e_test.cpp", + "video_decoder_e2e_test.cpp", + "e2e_test_jni.cpp", + "common.cpp", + "encoded_data_helper.cpp", + "video_frame.cpp", + "md5.cpp", + "mediacodec_encoder.cpp", + "mediacodec_decoder.cpp", + ], + shared_libs: [ + "liblog", + "libmediandk", + "libandroid", + ], + header_libs: ["liblog_headers"], + sdk_version: "28", + stl: "c++_static", + static_libs: ["libgtest_ndk_c++"], + // TODO(stevensd): Fix and reenable warnings + cflags: ["-Wno-everything"], +} diff --git a/tests/c2_e2e_test/jni/Android.mk b/tests/c2_e2e_test/jni/Android.mk deleted file mode 100644 index 890a74b..0000000 --- a/tests/c2_e2e_test/jni/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - video_encoder_e2e_test.cpp \ - video_decoder_e2e_test.cpp \ - e2e_test_jni.cpp \ - common.cpp \ - encoded_data_helper.cpp \ - video_frame.cpp \ - md5.cpp \ - mediacodec_encoder.cpp \ - mediacodec_decoder.cpp \ - -LOCAL_MODULE_TAGS := optional - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libmediandk \ - libandroid \ - -LOCAL_HEADER_LIBRARIES := liblog_headers - -LOCAL_SDK_VERSION := 28 -LOCAL_NDK_STL_VARIANT := c++_static - -LOCAL_STATIC_LIBRARIES := libgtest_ndk_c++ - -LOCAL_MODULE := libcodectest -LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD legacy_unencumbered -LOCAL_LICENSE_CONDITIONS := notice unencumbered -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE - -# TODO(stevensd): Fix and reenable warnings -LOCAL_CFLAGS += -Wno-everything - - -include $(BUILD_SHARED_LIBRARY) |