diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-05-09 16:26:42 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2018-05-09 16:39:41 -0700 |
commit | 9f022b4b5d6b7dde25290e793eb8b5c5239659af (patch) | |
tree | c9d82f2cc68caf511e8c1e47b3963e709173d818 /libfec | |
parent | dc0191161cb4557535e89d45c8cfdd2305dcef4e (diff) | |
download | extras-9f022b4b5d6b7dde25290e793eb8b5c5239659af.tar.gz |
Convert more of system/extras to Soong
See build/soong/README.md for more information.
Some modules are no longer installed by default on eng/debug builds, but
I didn't see any automatic references to them. If they're commonly used
by users, they can be added into build/make with PRODUCT_PACKAGES_ENG /
PRODUCT_PACKAGES_DEBUG. Otherwise everyone's compiles get a little
smaller.
Some modules also moved from /system/xbin to /system/bin, as we've
deprecated xbin. I checked codesearch for references to the full paths
and couldn't find any.
Test: cd system/extras; mma
Test: for the modules changing locations, check cs/ for references
Change-Id: I4ffd99d3dcf50e4d5cb2197824abc11973214133
Diffstat (limited to 'libfec')
-rw-r--r-- | libfec/Android.mk | 5 | ||||
-rw-r--r-- | libfec/test/Android.bp | 40 | ||||
-rw-r--r-- | libfec/test/Android.mk | 31 |
3 files changed, 40 insertions, 36 deletions
diff --git a/libfec/Android.mk b/libfec/Android.mk deleted file mode 100644 index 12974bc5..00000000 --- a/libfec/Android.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/test/Android.mk diff --git a/libfec/test/Android.bp b/libfec/test/Android.bp new file mode 100644 index 00000000..5cc6d86d --- /dev/null +++ b/libfec/test/Android.bp @@ -0,0 +1,40 @@ +cc_defaults { + name: "fec_test_defaults", + + gtest: false, + sanitize: { + misc_undefined: ["integer"], + }, + cflags: [ + "-Wall", + "-Werror", + "-D_GNU_SOURCE", + ], + target: { + darwin: { + enabled: false, + }, + }, +} + +cc_test_host { + name: "fec_test_read", + defaults: ["fec_test_defaults"], + srcs: ["test_read.cpp"], + static_libs: [ + "libfec", + "libfec_rs", + "libcrypto_utils", + "libcrypto", + "libext4_utils", + "libsquashfs_utils", + "libbase", + ], +} + +cc_test_host { + name: "fec_test_rs", + defaults: ["fec_test_defaults"], + srcs: ["test_rs.c"], + static_libs: ["libfec_rs"], +} diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk deleted file mode 100644 index 0d5e248f..00000000 --- a/libfec/test/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -ifeq ($(HOST_OS),linux) - -include $(CLEAR_VARS) -LOCAL_SANITIZE := integer -LOCAL_MODULE := fec_test_read -LOCAL_SRC_FILES := test_read.cpp -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := \ - libfec \ - libfec_rs \ - libcrypto_utils \ - libcrypto \ - libext4_utils \ - libsquashfs_utils \ - libbase -LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE -include $(BUILD_HOST_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_SANITIZE := integer -LOCAL_MODULE := fec_test_rs -LOCAL_SRC_FILES := test_rs.c -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libfec_rs -LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE -LOCAL_C_INCLUDES += external/fec -include $(BUILD_HOST_EXECUTABLE) - -endif # HOST_OS == linux |