diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2023-07-11 11:16:25 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2023-07-11 11:16:25 +0800 |
| commit | c181dec797a984e754e2d1798545ff4dc6328e2a (patch) | |
| tree | 05a8841a6945daa8f3314a46f7071f318c91bc6c | |
| parent | ca3578b10ea9322fa7e4dbe58aa75f727bf57534 (diff) | |
| download | android-build-configs-c181dec797a984e754e2d1798545ff4dc6328e2a.tar.gz | |
lkft: aosp: update to use the main branch
which is the default branch for AOSP tree now
Change-Id: I9909b5b123e93d6a8c5a035618b3c1c397f43d94
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | lkft-aosp-android13-db845c | 1 | ||||
| -rw-r--r-- | lkft-aosp-master-db845c | 5 | ||||
| -rw-r--r-- | lkft-aosp-master-hikey | 4 | ||||
| -rw-r--r-- | lkft-aosp-master-hikey960 | 5 | ||||
| -rw-r--r-- | lkft-aosp-master-x15 | 6 |
5 files changed, 9 insertions, 12 deletions
diff --git a/lkft-aosp-android13-db845c b/lkft-aosp-android13-db845c index 22daf7f9..fcb89f9e 100644 --- a/lkft-aosp-android13-db845c +++ b/lkft-aosp-android13-db845c @@ -2,7 +2,6 @@ MANIFEST_REPO=https://android.googlesource.com/platform/manifest.git MANIFEST_BRANCH=android13-gsi LOCAL_MANIFEST=https://android-git.linaro.org/git/platform/manifest.git LOCAL_MANIFEST_BRANCH=linaro-lkft-android13 -PATCHSETS="db845c-master-workarounds" TARGET_PRODUCT=db845c MAKE_TARGETS="droidcore" HOOK_PRE_ANDROID_BUILD="build-db845c-fetch-vendor-pacakge.sh" diff --git a/lkft-aosp-master-db845c b/lkft-aosp-master-db845c index 7a081459..48207726 100644 --- a/lkft-aosp-master-db845c +++ b/lkft-aosp-master-db845c @@ -1,9 +1,8 @@ MANIFEST_REPO=https://android.googlesource.com/platform/manifest.git -MANIFEST_BRANCH=master +MANIFEST_BRANCH=main MANIFEST_FILENAME=default.xml LOCAL_MANIFEST=https://android-git.linaro.org/git/platform/manifest.git -LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-master -PATCHSETS="db845c-master-workarounds" +LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-main TARGET_PRODUCT=db845c MAKE_TARGETS="droidcore" HOOK_PRE_ANDROID_BUILD="build-db845c-fetch-vendor-pacakge.sh" diff --git a/lkft-aosp-master-hikey b/lkft-aosp-master-hikey index 4c906998..73a34167 100644 --- a/lkft-aosp-master-hikey +++ b/lkft-aosp-master-hikey @@ -1,8 +1,8 @@ MANIFEST_REPO=https://android.googlesource.com/platform/manifest.git -MANIFEST_BRANCH=master +MANIFEST_BRANCH=main MANIFEST_FILENAME=default.xml LOCAL_MANIFEST=https://android-git.linaro.org/git/platform/manifest.git -LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-master +LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-main TARGET_PRODUCT=hikey MAKE_TARGETS="droid" HOOK_PRE_ANDROID_BUILD="build-hikey960-fetch-vendor-pacakge.sh" diff --git a/lkft-aosp-master-hikey960 b/lkft-aosp-master-hikey960 index 47f6b4a7..2ffe0e4a 100644 --- a/lkft-aosp-master-hikey960 +++ b/lkft-aosp-master-hikey960 @@ -1,9 +1,8 @@ MANIFEST_REPO=https://android.googlesource.com/platform/manifest.git -MANIFEST_BRANCH=master +MANIFEST_BRANCH=main MANIFEST_FILENAME=default.xml LOCAL_MANIFEST=https://android-git.linaro.org/git/platform/manifest.git -LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-master -PATCHSETS="hikey960-master-workarounds" +LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-main TARGET_PRODUCT=hikey960 MAKE_TARGETS="droid" HOOK_PRE_ANDROID_BUILD="build-hikey960-fetch-vendor-pacakge.sh" diff --git a/lkft-aosp-master-x15 b/lkft-aosp-master-x15 index 2db52710..720f4df3 100644 --- a/lkft-aosp-master-x15 +++ b/lkft-aosp-master-x15 @@ -1,8 +1,8 @@ MANIFEST_REPO=https://android.googlesource.com/platform/manifest.git -MANIFEST_BRANCH=master +MANIFEST_BRANCH=main MANIFEST_FILENAME=default.xml LOCAL_MANIFEST=https://android-git.linaro.org/git/platform/manifest.git -LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-master -PATCHSETS="x15-master-workarounds" +LOCAL_MANIFEST_BRANCH=linaro-lkft-aosp-main +PATCHSETS="x15-main-workarounds" TARGET_PRODUCT=beagle_x15 MAKE_TARGETS="droid" |