diff options
| author | Yuntao Xu <yuntaoxu@google.com> | 2021-04-28 22:28:02 -0700 |
|---|---|---|
| committer | Yuntao Xu <yuntaoxu@google.com> | 2021-05-03 12:11:50 -0700 |
| commit | 7195457b9682e3d9690385d45328fb9c49066b18 (patch) | |
| tree | e88fa579f47e9ed04fa3550647abe903c3479601 /slideshow | |
| parent | ac2e71ce6971ad3b61bcafb8d0c598fc5f94d043 (diff) | |
| download | extras-7195457b9682e3d9690385d45328fb9c49066b18.tar.gz | |
Convert slideshow/Android.mk to Android.bp
Convert the Make file to a Soong one
Bug: 186677673
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: Ib20a8fe43124184bce9a451d6265b6edec7b04d5
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/Android.bp | 36 | ||||
| -rw-r--r-- | slideshow/Android.mk | 24 |
2 files changed, 36 insertions, 24 deletions
diff --git a/slideshow/Android.bp b/slideshow/Android.bp new file mode 100644 index 00000000..b6c3922a --- /dev/null +++ b/slideshow/Android.bp @@ -0,0 +1,36 @@ +// Copyright 2015 The Android Open Source Project + +package { + default_applicable_licenses: ["system_extras_slideshow_license"], +} + +// See: http://go/android-license-faq +license { + name: "system_extras_slideshow_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + +cc_binary { + name: "slideshow", + srcs: ["slideshow.cpp"], + cflags: [ + "-D__STDC_LIMIT_MACROS", + ], + shared_libs: [ + "libminui", + "libpng", + "libbase", + "libz", + "libutils", + "libcutils", + "liblog", + "libm", + "libc", + ], +} diff --git a/slideshow/Android.mk b/slideshow/Android.mk deleted file mode 100644 index 42d6719e..00000000 --- a/slideshow/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2015 The Android Open Source Project - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := slideshow.cpp -LOCAL_MODULE := slideshow -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS -Werror -LOCAL_SHARED_LIBRARIES := \ - libminui \ - libpng \ - libbase \ - libz \ - libutils \ - libcutils \ - liblog \ - libm \ - libc -include $(BUILD_EXECUTABLE) |