diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:37:42 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:37:42 +0000 |
commit | 8f239dee9210382dd3969cd9d76f76afbc2fda31 (patch) | |
tree | d6fc62600342d3117da115c58ad22ef995529ea7 | |
parent | b9a7b3303db5c83a3b43a5a740b74fae2bab1e37 (diff) | |
parent | fb58be9d9dc007f389c860109b6450c985b2eb5d (diff) | |
download | skqp-android12-mainline-tethering-release.tar.gz |
Snap for 7550844 from fb58be9d9dc007f389c860109b6450c985b2eb5d to mainline-tethering-releaseandroid-mainline-12.0.0_r95android-mainline-12.0.0_r82android-mainline-12.0.0_r66android-mainline-12.0.0_r53android-mainline-12.0.0_r38android-mainline-12.0.0_r18android-mainline-12.0.0_r125android-mainline-12.0.0_r110aml_tet_311811050android12-mainline-tethering-release
Change-Id: Ifa23929cf97063373962eadd4883c8ff0530ccfc
-rw-r--r-- | Android.bp | 54 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | platform_tools/android/apps/skqp/src/main/Android.bp | 18 | ||||
-rw-r--r-- | platform_tools/android/apps/skqp/src/main/AndroidManifest.xml | 7 |
4 files changed, 63 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp index 9888fc739b..a9d86ff66f 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,45 @@ // This file is autogenerated by tools/skqp/gn_to_bp.py. +package { + default_applicable_licenses: ["external_skqp_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 filtered out the below license kinds as false-positives: +// SPDX-license-identifier-GPL-2.0 +// SPDX-license-identifier-LGPL-2.1 +// SPDX-license-identifier-OFL +// See: http://go/android-license-faq +license { + name: "external_skqp_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-CC0-1.0", + "SPDX-license-identifier-FTL", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-MPL", + "legacy_unencumbered", + ], + license_text: [ + "LICENSE", + ], +} + cc_library_shared { name: "libskqp_app", sdk_version: "26", @@ -1610,18 +1650,6 @@ cc_library_shared { ], }, - mips: { - srcs: [ - - ], - }, - - mips64: { - srcs: [ - - ], - }, - x86: { srcs: [ "src/opts/SkOpts_avx.cpp", @@ -1643,6 +1671,8 @@ cc_library_shared { }, }, + header_libs: ["jni_headers"], + shared_libs: [ "libandroid", "libEGL", diff --git a/METADATA b/METADATA new file mode 100644 index 0000000000..5c3f89cea7 --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: RECIPROCAL +} diff --git a/platform_tools/android/apps/skqp/src/main/Android.bp b/platform_tools/android/apps/skqp/src/main/Android.bp index 5df47bd8b5..1281453012 100644 --- a/platform_tools/android/apps/skqp/src/main/Android.bp +++ b/platform_tools/android/apps/skqp/src/main/Android.bp @@ -2,15 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_skqp_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // SPDX-license-identifier-CC0-1.0 + // SPDX-license-identifier-MIT + // legacy_unencumbered + default_applicable_licenses: ["external_skqp_license"], +} + android_test { name: "CtsSkQPTestCases", defaults: ["cts_defaults"], - test_suites: [ - "cts", - "vts10", - "general-tests", - ], libs: ["android.test.runner.stubs"], jni_libs: ["libskqp_app"], compile_multilib: "both", diff --git a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml index f97863547e..d046036b54 100644 --- a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml +++ b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml @@ -11,7 +11,9 @@ android:theme="@style/AppTheme" android:label="SkQP"> - <activity android:name=".MainActivity"> + <activity + android:name=".MainActivity" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> @@ -20,7 +22,8 @@ <activity android:name=".SkQPActivity" android:label="@string/title_activity_skqp" - android:theme="@style/AppTheme.NoActionBar"> + android:theme="@style/AppTheme.NoActionBar" + android:exported="true"> <intent-filter> <action android:name="com.google.intent.action.TEST_LOOP"/> <category android:name="android.intent.category.DEFAULT"/> |