Merge "Snap for 7168215 from 68ca7e13156246d424b80c781e83434d1f97810a to simpleperf-release" into simpleperf-release

2 files changed, 38 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index a38451a8b..f48e34019 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,43 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["external_openssh_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
+// See: http://go/android-license-faq
+license {
+    name: "external_openssh_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Beerware",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-OpenSSL",
+        "legacy_notice",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENCE",
+    ],
+}
+
 cc_defaults {
     name: "ssh_defaults",
     vendor: true,
diff --git a/prebuilt-intermediates/config.h b/prebuilt-intermediates/config.h
index b0d0f3517..17dc84246 100644
--- a/prebuilt-intermediates/config.h
+++ b/prebuilt-intermediates/config.h
@@ -1621,7 +1621,7 @@
 
 #define _PATH_PRIVSEP_CHROOT_DIR SSHDIR "/empty"
 
-#define _PATH_SSH_PROGRAM "/system/bin/sftp"
+#define _PATH_SSH_PROGRAM "/system/bin/ssh"
 
 /* Utilize some of the LibreSSL compatibility layer */
 #define HAVE_DH_GET0_KEY 1