release-request-2c5efa61-1f02-4e74-bfeb-1ca3cd5028bd-for-git_pi-release-4301718 snap-temp-L56500000097146696android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release

Change-Id: Ie43a9c3aec30c0beb8e7f25cff2456d4f978c7c2

2 files changed, 54 insertions, 75 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..8a7a686
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,54 @@
+//
+// Copyright (C) 2015 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_defaults {
+    name: "libdivsufsort_defaults",
+    host_supported: true,
+    srcs: [
+        "lib/divsufsort.c",
+        "lib/sssort.c",
+        "lib/trsort.c",
+        "lib/utils.c",
+    ],
+    local_include_dirs: ["include"],
+    export_include_dirs: ["android_include"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+        "-DHAVE_CONFIG_H=1",
+    ],
+}
+
+// libdivsufsort defines two different libraries compiled from the same
+// codebase. The libraries export different symbols and differ on the integer
+// type used in the suffix array index. "libdivsufsort" uses 32-bit integers
+// allowing input sizes up to 2GiB, while "libdivsufsort64" uses 64-bit integers
+// allowing larger input sizes (8 EiB) but also requiring twice as much memory
+// for the smaller inputs.
+
+// libdivsufsort using 32-bit integers for the suffix array.
+cc_library_static {
+    name: "libdivsufsort",
+    defaults: ["libdivsufsort_defaults"],
+}
+
+// libdivsufsort using 64-bit integers for the suffix array.
+cc_library_static {
+    name: "libdivsufsort64",
+    defaults: ["libdivsufsort_defaults"],
+    cflags: ["-DBUILD_DIVSUFSORT64"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 97277a2..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2015 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)
-
-libdivsufsort_src_files := \
-    lib/divsufsort.c \
-    lib/sssort.c \
-    lib/trsort.c \
-    lib/utils.c
-
-libdivsufsort_c_includes := \
-    $(LOCAL_PATH)/android_include \
-    $(LOCAL_PATH)/include
-
-libdivsufsort_export_c_include_dirs := $(LOCAL_PATH)/android_include
-
-libdivsufsort_cflags := \
-    -Wall \
-    -Werror \
-    -Wextra \
-    -DHAVE_CONFIG_H=1
-
-# libdivsufsort using 32-bit integers for the suffix array (host static lib)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdivsufsort
-LOCAL_SRC_FILES := $(libdivsufsort_src_files)
-LOCAL_C_INCLUDES := $(libdivsufsort_c_includes)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs)
-LOCAL_CFLAGS := $(libdivsufsort_cflags)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# libdivsufsort using 64-bit integers for the suffix array (host static lib)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdivsufsort64
-LOCAL_SRC_FILES := $(libdivsufsort_src_files)
-LOCAL_C_INCLUDES := $(libdivsufsort_c_includes)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs)
-LOCAL_CFLAGS := \
-    $(libdivsufsort_cflags) \
-    -DBUILD_DIVSUFSORT64
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# libdivsufsort using 32-bit integers for the suffix array (target static lib)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdivsufsort
-LOCAL_SRC_FILES := $(libdivsufsort_src_files)
-LOCAL_C_INCLUDES := $(libdivsufsort_c_includes)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs)
-LOCAL_CFLAGS := $(libdivsufsort_cflags)
-include $(BUILD_STATIC_LIBRARY)
-
-# libdivsufsort using 64-bit integers for the suffix array (target static lib)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdivsufsort64
-LOCAL_SRC_FILES := $(libdivsufsort_src_files)
-LOCAL_C_INCLUDES := $(libdivsufsort_c_includes)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs)
-LOCAL_CFLAGS := \
-    $(libdivsufsort_cflags) \
-    -DBUILD_DIVSUFSORT64
-include $(BUILD_STATIC_LIBRARY)