From d4f3f90134fb7c12ff3a10bde609d78658e17da4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 20 May 2015 13:11:14 -0700 Subject: Rename Blueprints to Android.bp Rename module definition files to Android.bp to avoid conflicts with another project called Blueprint. Change-Id: Id6f5d363da5bba33ff587accd3e7ac10ecbf5350 --- libs/binder/Android.bp | 61 ++++++++++++++++++++++++++++++++++++ libs/binder/Blueprints | 61 ------------------------------------ libs/ui/Android.bp | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ libs/ui/Blueprints | 81 ------------------------------------------------ libs/ui/tests/Android.bp | 31 ++++++++++++++++++ libs/ui/tests/Blueprints | 31 ------------------ 6 files changed, 173 insertions(+), 173 deletions(-) create mode 100644 libs/binder/Android.bp delete mode 100644 libs/binder/Blueprints create mode 100644 libs/ui/Android.bp delete mode 100644 libs/ui/Blueprints create mode 100644 libs/ui/tests/Android.bp delete mode 100644 libs/ui/tests/Blueprints diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp new file mode 100644 index 0000000000..8107d92aa1 --- /dev/null +++ b/libs/binder/Android.bp @@ -0,0 +1,61 @@ +// Copyright (C) 2009 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. + +// we have the common sources, plus some device-specific stuff +sources = [ + "AppOpsManager.cpp", + "Binder.cpp", + "BpBinder.cpp", + "BufferedTextOutput.cpp", + "Debug.cpp", + "IAppOpsCallback.cpp", + "IAppOpsService.cpp", + "IBatteryStats.cpp", + "IInterface.cpp", + "IMemory.cpp", + "IPCThreadState.cpp", + "IPermissionController.cpp", + "IServiceManager.cpp", + "MemoryDealer.cpp", + "MemoryBase.cpp", + "MemoryHeapBase.cpp", + "Parcel.cpp", + "PermissionCache.cpp", + "ProcessState.cpp", + "Static.cpp", + "TextOutput.cpp", +] + +cc_library { + name: "libbinder", + cflags: ["-Werror"], + srcs: sources, + shared_libs: [ + "liblog", + "libcutils", + "libutils", + ], + // ANDROIDMK TRANSLATION ERROR: unsupported conditional + // ifneq ($(TARGET_USES_64_BIT_BINDER),true) + // ANDROIDMK TRANSLATION ERROR: unsupported conditional + // ifneq ($(TARGET_IS_64_BIT),true) + multilib: { + lib32: { + cflags: ["-DBINDER_IPC_32BIT=1"] + } + } + // endif + // ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional + // endif +} diff --git a/libs/binder/Blueprints b/libs/binder/Blueprints deleted file mode 100644 index 8107d92aa1..0000000000 --- a/libs/binder/Blueprints +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2009 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. - -// we have the common sources, plus some device-specific stuff -sources = [ - "AppOpsManager.cpp", - "Binder.cpp", - "BpBinder.cpp", - "BufferedTextOutput.cpp", - "Debug.cpp", - "IAppOpsCallback.cpp", - "IAppOpsService.cpp", - "IBatteryStats.cpp", - "IInterface.cpp", - "IMemory.cpp", - "IPCThreadState.cpp", - "IPermissionController.cpp", - "IServiceManager.cpp", - "MemoryDealer.cpp", - "MemoryBase.cpp", - "MemoryHeapBase.cpp", - "Parcel.cpp", - "PermissionCache.cpp", - "ProcessState.cpp", - "Static.cpp", - "TextOutput.cpp", -] - -cc_library { - name: "libbinder", - cflags: ["-Werror"], - srcs: sources, - shared_libs: [ - "liblog", - "libcutils", - "libutils", - ], - // ANDROIDMK TRANSLATION ERROR: unsupported conditional - // ifneq ($(TARGET_USES_64_BIT_BINDER),true) - // ANDROIDMK TRANSLATION ERROR: unsupported conditional - // ifneq ($(TARGET_IS_64_BIT),true) - multilib: { - lib32: { - cflags: ["-DBINDER_IPC_32BIT=1"] - } - } - // endif - // ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional - // endif -} diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp new file mode 100644 index 0000000000..259d79f625 --- /dev/null +++ b/libs/ui/Android.bp @@ -0,0 +1,81 @@ +// Copyright (C) 2010 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_shared { + + clang: true, + cppflags: [ + "-std=c++1y", + "-Weverything", + "-Werror", + + // The static constructors and destructors in this library have not + // been noted to introduce significant overheads + "-Wno-exit-time-destructors", + "-Wno-global-constructors", + + // We only care about compiling as C++14 + "-Wno-c++98-compat-pedantic", + + // We use four-character constants for the GraphicBuffer header, and + // don't care that they're non-portable as long as they're consistent + // within one execution + "-Wno-four-char-constants", + + // Don't warn about struct padding + "-Wno-padded", + ], + + srcs: [ + "Fence.cpp", + "FramebufferNativeWindow.cpp", + "FrameStats.cpp", + "GraphicBuffer.cpp", + "GraphicBufferAllocator.cpp", + "GraphicBufferMapper.cpp", + "PixelFormat.cpp", + "Rect.cpp", + "Region.cpp", + "UiConfig.cpp", + ], + + shared_libs: [ + "libcutils", + "libhardware", + "libsync", + "libutils", + "liblog", + ], + + // ANDROIDMK TRANSLATION ERROR: unsupported conditional + // ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),) + //cflags: ["-DFRAMEBUFFER_FORCE_FORMAT=" + BOARD_FRAMEBUFFER_FORCE_FORMAT], + // ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional + // endif + name: "libui", + +} + +// Include subdirectory makefiles +// ============================================================ +subdirs = ["tests"] + +// If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework +// team really wants is to build the stuff defined by this makefile. +// ANDROIDMK TRANSLATION ERROR: unsupported conditional +// ifeq (,$(ONE_SHOT_MAKEFILE)) +// ANDROIDMK TRANSLATION ERROR: unsupported include +// include $(call first-makefiles-under,$(LOCAL_PATH)) +// ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional +// endif diff --git a/libs/ui/Blueprints b/libs/ui/Blueprints deleted file mode 100644 index 259d79f625..0000000000 --- a/libs/ui/Blueprints +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (C) 2010 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_shared { - - clang: true, - cppflags: [ - "-std=c++1y", - "-Weverything", - "-Werror", - - // The static constructors and destructors in this library have not - // been noted to introduce significant overheads - "-Wno-exit-time-destructors", - "-Wno-global-constructors", - - // We only care about compiling as C++14 - "-Wno-c++98-compat-pedantic", - - // We use four-character constants for the GraphicBuffer header, and - // don't care that they're non-portable as long as they're consistent - // within one execution - "-Wno-four-char-constants", - - // Don't warn about struct padding - "-Wno-padded", - ], - - srcs: [ - "Fence.cpp", - "FramebufferNativeWindow.cpp", - "FrameStats.cpp", - "GraphicBuffer.cpp", - "GraphicBufferAllocator.cpp", - "GraphicBufferMapper.cpp", - "PixelFormat.cpp", - "Rect.cpp", - "Region.cpp", - "UiConfig.cpp", - ], - - shared_libs: [ - "libcutils", - "libhardware", - "libsync", - "libutils", - "liblog", - ], - - // ANDROIDMK TRANSLATION ERROR: unsupported conditional - // ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),) - //cflags: ["-DFRAMEBUFFER_FORCE_FORMAT=" + BOARD_FRAMEBUFFER_FORCE_FORMAT], - // ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional - // endif - name: "libui", - -} - -// Include subdirectory makefiles -// ============================================================ -subdirs = ["tests"] - -// If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework -// team really wants is to build the stuff defined by this makefile. -// ANDROIDMK TRANSLATION ERROR: unsupported conditional -// ifeq (,$(ONE_SHOT_MAKEFILE)) -// ANDROIDMK TRANSLATION ERROR: unsupported include -// include $(call first-makefiles-under,$(LOCAL_PATH)) -// ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional -// endif diff --git a/libs/ui/tests/Android.bp b/libs/ui/tests/Android.bp new file mode 100644 index 0000000000..8c84e4b454 --- /dev/null +++ b/libs/ui/tests/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright (C) 2014 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 { + shared_libs: ["libui"], + srcs: ["Region_test.cpp"], + name: "Region_test", +} + +cc_test { + srcs: ["vec_test.cpp"], + name: "vec_test", +} + +cc_test { + srcs: ["mat_test.cpp"], + name: "mat_test", +} diff --git a/libs/ui/tests/Blueprints b/libs/ui/tests/Blueprints deleted file mode 100644 index 8c84e4b454..0000000000 --- a/libs/ui/tests/Blueprints +++ /dev/null @@ -1,31 +0,0 @@ -// -// Copyright (C) 2014 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 { - shared_libs: ["libui"], - srcs: ["Region_test.cpp"], - name: "Region_test", -} - -cc_test { - srcs: ["vec_test.cpp"], - name: "vec_test", -} - -cc_test { - srcs: ["mat_test.cpp"], - name: "mat_test", -} -- cgit v1.2.3