Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e3988b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: update libchrome upstream location." am: b7497a4d am:... 

Merge "floss: update libchrome upstream location." am: b7497a4d am: ee0babde am: 24aad933 am: 7137c822

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2138116



Change-Id: Iec56020f7bfbe4dc90c03a7eee204b4eb0148b73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08e9ceab 7137c822

system/build/dpkg/libchrome/debian/control

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Section: libs 
Priority: optional

Maintainer: Sonny Sasaka <sonnysasaka@chromium.org>

Standards-Version: 4.1.4

Homepage: https://chromium.googlesource.com/aosp/platform/external/libchrome/

Homepage: https://chromium.googlesource.com/chromiumos/platform/libchrome/

Build-Depends:

 debhelper (>=11~),

 clang,

system/build/dpkg/libchrome/gen-src-pkg.sh

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ origtar=libchrome_930012.orig.tar.gz 
scriptdir="$( cd "$( dirname "$0" )" && pwd )"



# Pin the libchrome branch + commit

libchrome_branch=master

libchrome_branch=main

libchrome_commit=4b86c42f09b7c8d88b0233c60f59bafeb4d8df19



# Pin the platform2 branch + commit
@@ -32,7 +32,7 @@ cd "${pkgdir}" 
cp -a ../platform2/{common-mk,.gn} .



# Download libchrome source and apply Chrome OS's patches.

git clone --branch "${libchrome_branch}" https://chromium.googlesource.com/aosp/platform/external/libchrome || exit 1

git clone --branch "${libchrome_branch}" https://chromium.googlesource.com/chromiumos/platform/libchrome || exit 1

cd libchrome

git checkout "${libchrome_commit}"

rm -rf .git