diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-07-12 22:10:56 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-07-13 17:41:45 -0700 |
commit | 45f05240c2d9d1f3903e2766b4883e256288f6c2 (patch) | |
tree | ee0405336f534c9b00448860c3df845452e43223 /adf | |
parent | dc9fbc34402a61ca9b23714b78cac4f92ee113e2 (diff) | |
download | system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.gz system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.bz2 system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.zip |
Convert more Android.mk files to Android.bp
These modules have their dependencies satisfied, and aren't doing
anything strange.
Change-Id: I72039a15256cbd5e5eee0d79a15d66d74a6c087d
Diffstat (limited to 'adf')
-rw-r--r-- | adf/Android.bp | 1 | ||||
-rw-r--r-- | adf/Android.mk | 18 | ||||
-rw-r--r-- | adf/libadf/Android.bp | 21 | ||||
-rw-r--r-- | adf/libadf/Android.mk | 24 | ||||
-rw-r--r-- | adf/libadf/tests/Android.bp | 22 | ||||
-rw-r--r-- | adf/libadf/tests/Android.mk | 23 | ||||
-rw-r--r-- | adf/libadfhwc/Android.bp | 29 | ||||
-rw-r--r-- | adf/libadfhwc/Android.mk | 25 |
8 files changed, 73 insertions, 90 deletions
diff --git a/adf/Android.bp b/adf/Android.bp new file mode 100644 index 000000000..b44c29601 --- /dev/null +++ b/adf/Android.bp @@ -0,0 +1 @@ +subdirs = ["*"] diff --git a/adf/Android.mk b/adf/Android.mk deleted file mode 100644 index 64d486e50..000000000 --- a/adf/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2013 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 := $(my-dir) - -include $(call first-makefiles-under,$(LOCAL_PATH)) diff --git a/adf/libadf/Android.bp b/adf/libadf/Android.bp new file mode 100644 index 000000000..2b5461e3b --- /dev/null +++ b/adf/libadf/Android.bp @@ -0,0 +1,21 @@ +// Copyright (C) 2013 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: "libadf", + srcs: ["adf.c"], + cflags: ["-Werror"], + local_include_dirs: ["include"], + export_include_dirs: ["include"], +} diff --git a/adf/libadf/Android.mk b/adf/libadf/Android.mk deleted file mode 100644 index 7df354bc2..000000000 --- a/adf/libadf/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2013 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_SRC_FILES := adf.c -LOCAL_MODULE := libadf -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -Werror -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) -include $(BUILD_STATIC_LIBRARY) diff --git a/adf/libadf/tests/Android.bp b/adf/libadf/tests/Android.bp new file mode 100644 index 000000000..7b333004d --- /dev/null +++ b/adf/libadf/tests/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2013 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: "adf-unit-tests", + srcs: ["adf_test.cpp"], + static_libs: ["libadf"], + cflags: ["-Werror"], +} diff --git a/adf/libadf/tests/Android.mk b/adf/libadf/tests/Android.mk deleted file mode 100644 index 68e5817fc..000000000 --- a/adf/libadf/tests/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2013 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 := $(my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := adf_test.cpp -LOCAL_MODULE := adf-unit-tests -LOCAL_STATIC_LIBRARIES := libadf -LOCAL_CFLAGS += -Werror -include $(BUILD_NATIVE_TEST) diff --git a/adf/libadfhwc/Android.bp b/adf/libadfhwc/Android.bp new file mode 100644 index 000000000..86f0c9c21 --- /dev/null +++ b/adf/libadfhwc/Android.bp @@ -0,0 +1,29 @@ +// Copyright (C) 2013 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: "libadfhwc", + srcs: ["adfhwc.cpp"], + static_libs: [ + "libadf", + "liblog", + "libutils", + ], + cflags: [ + "-DLOG_TAG=\\\"adfhwc\\\"", + "-Werror", + ], + local_include_dirs: ["include"], + export_include_dirs: ["include"], +} diff --git a/adf/libadfhwc/Android.mk b/adf/libadfhwc/Android.mk deleted file mode 100644 index 898f9c967..000000000 --- a/adf/libadfhwc/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2013 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_SRC_FILES := adfhwc.cpp -LOCAL_MODULE := libadfhwc -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libadf liblog libutils -LOCAL_CFLAGS += -DLOG_TAG=\"adfhwc\" -Werror -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) -include $(BUILD_STATIC_LIBRARY) |