aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-12 02:43:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-12 02:43:37 +0000
commitfa4b1c0bbc75e7c263f30f2f3565e14995845821 (patch)
tree8629030a3a0d9a6461c6c54e84ca1e2778f3add7
parentcf46291aa8a9d2d970d1d80d1c8705659e47aec1 (diff)
parent97df94a3690427e842daaa7c9d1267d4d23715bc (diff)
downloadplatform_external_pthreadpool-fa4b1c0bbc75e7c263f30f2f3565e14995845821.tar.gz
platform_external_pthreadpool-fa4b1c0bbc75e7c263f30f2f3565e14995845821.tar.bz2
platform_external_pthreadpool-fa4b1c0bbc75e7c263f30f2f3565e14995845821.zip
Add build files and meta data files am: c5ceb72c81 am: fded4c7123 am: 97df94a369
Change-Id: Ie64d5317927de9c92158f22b6b57a46198e1bd33
-rw-r--r--Android.bp54
-rw-r--r--METADATA19
-rw-r--r--MODULE_LICENSE_BSD0
l---------NOTICE1
-rw-r--r--TEST_MAPPING7
-rw-r--r--jni/Android.mk17
-rw-r--r--jni/Application.mk4
7 files changed, 81 insertions, 21 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..d366438
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,54 @@
+// Copyright (C) 2020 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: "libpthreadpool",
+ export_include_dirs: ["include"],
+ vendor_available: true,
+ sdk_version: "current",
+ srcs: [
+ "src/threadpool-pthreads.c",
+ "src/threadpool-legacy.c",
+ ],
+ cflags: [
+ "-std=gnu11",
+ "-O2",
+ "-Wno-deprecated-declarations",
+ "-Wno-missing-field-initializers",
+ ],
+ header_libs: [
+ "fxdiv_headers",
+ ],
+}
+
+cc_test {
+ name: "PthreadPoolTests",
+ sdk_version: "current",
+ srcs: [
+ "test/pthreadpool.cc",
+ ],
+ cflags: [
+ "-Wno-unused-parameter",
+ "-Wno-missing-field-initializers",
+ ],
+ stl: "libc++_static",
+ static_libs: [
+ "libgmock_ndk",
+ "libpthreadpool",
+ ],
+ test_suites: [
+ "general-tests",
+ ],
+}
+
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..4df42c6
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,19 @@
+name: "pthreadpool"
+description:
+ "pthreadpool is a portable and efficient thread pool implementation. It "
+ "provides similar functionality to #pragma omp parallel for, but with "
+ "additional features."
+
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/Maratyszcza/pthreadpool"
+ }
+ url {
+ type: GIT
+ value: "https://github.com/Maratyszcza/pthreadpool"
+ }
+ version: "d465747660ecf9ebbaddf8c3db37e4a13d0c9103"
+ last_upgrade_date { year: 2020 month: 2 day: 3 }
+ license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_BSD
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE \ No newline at end of file
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..8c27c74
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "PthreadPoolTests"
+ }
+ ]
+}
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100644
index 32d1f77..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)/..
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := pthreadpool_interface
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := pthreadpool
-LOCAL_SRC_FILES := src/threadpool-pthreads.c
-LOCAL_CFLAGS := -std=c99 -Wall
-LOCAL_STATIC_LIBRARIES := pthreadpool_interface fxdiv
-include $(BUILD_STATIC_LIBRARY)
-
-$(call import-add-path,$(LOCAL_PATH)/deps)
-
-$(call import-module,fxdiv/jni)
diff --git a/jni/Application.mk b/jni/Application.mk
deleted file mode 100644
index 0f660e3..0000000
--- a/jni/Application.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-APP_PLATFORM := android-15
-APP_PIE := true
-APP_STL := c++_static
-APP_ABI := all