Snap for 8426163 from 4ae7c6ee6aa6ded74f79633e3de2577e3f913ee7 to mainline-tzdata2-release
Change-Id: I72c37eb2c0ab22dd0548952356223c1363abc94b
diff --git a/Android.bp b/Android.bp
index c1c0308..6ebce88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,48 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["external_flatbuffers_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
- name: "external_flatbuffers_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-Zlib",
- ],
- license_text: [
- "LICENSE",
- "LICENSE.txt",
- ],
-}
-
cc_library_headers {
name: "flatbuffer_headers",
export_include_dirs: ["include"],
vendor_available: true,
- host_supported: true,
sdk_version: "current",
apex_available: [
"com.android.neuralnetworks",
@@ -103,7 +65,6 @@
export_include_dirs: ["include"],
cpp_std: "c++17",
host_supported: true,
- vendor_available: true,
local_include_dirs: [
"include",
],
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 765a11d..78614fb 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -23,9 +23,6 @@
# FlatBuffers headers as a module.
include $(CLEAR_VARS)
LOCAL_MODULE := flatbuffers
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-Zlib
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../LICENSE.txt
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_CPPFLAGS := -std=c++11 -fexceptions -Wall \
-DFLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE
@@ -36,9 +33,6 @@
# for projects that want richer functionality.
include $(CLEAR_VARS)
LOCAL_MODULE := flatbuffers_extra
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-Zlib
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../LICENSE.txt
LOCAL_SRC_FILES := src/idl_parser.cpp \
src/idl_gen_text.cpp \
src/reflection.cpp \
@@ -50,9 +44,6 @@
# FlatBuffers test
include $(CLEAR_VARS)
LOCAL_MODULE := FlatBufferTest
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-Zlib
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../LICENSE.txt
LOCAL_SRC_FILES := android/jni/main.cpp \
tests/test.cpp \
tests/test_assert.h \
diff --git a/samples/android/jni/Android.mk b/samples/android/jni/Android.mk
index ea3e677..917c2f9 100644
--- a/samples/android/jni/Android.mk
+++ b/samples/android/jni/Android.mk
@@ -24,9 +24,6 @@
include $(FLATBUFFERS_ROOT_DIR)/android/jni/include.mk
LOCAL_MODULE := FlatBufferSample
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../LICENSE $(LOCAL_PATH)/../../../LICENSE.txt
# Set up some useful variables to identify schema and output directories and
# schema files.