-
Notifications
You must be signed in to change notification settings - Fork 13
-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fail to sync sourcetree to android-10.0.0_r1 #456
Comments
omnirom/android@035aff0 And LineageOS 17 (but it looks not tidy) |
@stefanhh0 Please be a little patient. The SODP contributors are hard at work supporting android 10, but as long as it doesn't show up on the build-guide page we're not there yet. I don't think the "bug" label is in place here. If however you want to help out and (compile-)test + contribute, you are completely welcome! We're currently sorting through commits before submitting PRs (and making sure Pie is not destroyed in the process), which you can find mostly on my forks: https://github.com/MarijnS95?tab=repositories |
Understand, I just gave it a try since the branch android-10.0.0_r1 already showed up in the local_manifests. Thanks for your prompt feedback and yes I guess this can be closed then... Sorry for being a little impatient. Thanks for working on it! I may give it a try with the master/android-q from your forks. Thanks a lot & Cheers |
Ah that's true, Alin already created a manifest branch for us but so far it still points to android 9. I just pushed some more stuff to the branches. The Q branch on my I'm hoping to get things merged over the coming week, but we have to go through outstanding Pie PRs first. |
@stefanhh0 Most of the PRs have been submitted and merged 😁 Since we are in the middle of a conversion to 4.14, you'll likely want to build 4.9 for the time being. I'll put up a |
Cool, tried today syncing works just fine now. I did following and one of the make file causes an error for both when trying to build msm-4-9 and msm-4.14. Here the output for msm-4.9:
|
Inline kernel building doesn't really work anymore because google is blocking external tools to "make builds more reliable" and/or incremental. You should instead use a prebuilt kernel (which you can of course build yourself with the provided scripts, check my forks for path fixes). |
Okay thanks a lot for the hint :-) Just included your fork of kernel-sony-msm-4.9-common in my source tree and changed the build-kernels-clang.sh to only build lilac since i don't need the others. |
Building the kernel worked just fine now. Reverted the sm8150 to sdm845 as you have written in the previous comment. I guess I am now missing some other not yet merged back PRs or msm-4.9 currently is just not working in general with Q. The build now returns following build error after a while:
Well if you have another hint that would be nice, however I can also just wait until you have finished the transitioning to Q. |
@stefanhh0 Looks like you're almost there. You need to check out the display HAL and interfaces back on 7.3, essentially reverting sonyxperiadev/local_manifests@91c8fe5, and remove the separate display interface repository sonyxperiadev/local_manifests@52af0a2. You can do this by hand or by reverting those commits and resync. Then you need to locally fetch+merge the PR to display and location: https://github.com/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+author%3AMarijnS95+archived%3Afalse+sort%3Aupdated-desc+org%3Asonyxperiadev |
@MarijnS95 thanks a lot for your help! Build went through now and all img's have been written accordingly. I will flash them later. I have seen that there is an additional boot-debug.img I guess that one should be preferred over boot,img to have more meaningful error reports, correct? I've applied the changes of your 2 PRs manually since I couldn't figure out the correct git fetch command yesterday. However now I managed it with reading more carefully https://help.github.com/en/articles/checking-out-pull-requests-locally :-) Cheers, Stefan |
Just another question, a little OT though. Open gapps for android 10 is not yet available (download is still greyed out), have you any experience whether or not open gapps 9 will work together with android 10? |
@stefanhh0 I haven't noticed Opengapps requires a few modifications. I built it in the tree (see their |
Since I am always building userdebug and not user it is not relevant. Regarding opengapps I will just wait until it is available. Tried it with including pico in the source tree as explained in https://github.com/opengapps/aosp_build a few days ago but it was failing probably due to the missing changes you have mentioned. |
Ah, that's good to know if we ever do user builds somewhere. https://github.com/MarijnS95/opengapps_aosp_build is what you can use to build it. GitHub doesn't allow copy-pasting, so here are the permission diffs you can apply to `sources/all`diff --git a/etc/permissions/privapp-permissions-google.xml b/etc/permissions/privapp-permissions-google.xml
index 0b46f07..2d2e5cd 100644
--- a/etc/permissions/privapp-permissions-google.xml
+++ b/etc/permissions/privapp-permissions-google.xml
@@ -81,12 +81,14 @@ It allows additional grants on top of privapp-permissions-platform.xml
<permission name="android.permission.MANAGE_USERS"/>
<permission name="android.permission.PACKAGE_USAGE_STATS"/>
<permission name="android.permission.PACKAGE_VERIFICATION_AGENT"/>
+ <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<permission name="android.permission.READ_RUNTIME_PROFILES"/>
<permission name="android.permission.REAL_GET_TASKS"/>
- <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
- <permission name="android.permission.REBOOT" />
+ <permission name="android.permission.REBOOT"/>
+ <permission name="android.permission.SEND_DEVICE_CUSTOMIZATION_READY"/>
<permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
<permission name="android.permission.SET_PREFERRED_APPLICATIONS"/>
+ <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<permission name="android.permission.STATUS_BAR"/>
<permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
<permission name="android.permission.UPDATE_DEVICE_STATS"/>
@@ -297,6 +299,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
<permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
<permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
<permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
+ <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"/>
<permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
<permission name="android.permission.DUMP"/>
<permission name="android.permission.GET_APP_OPS_STATS"/>
@@ -305,7 +308,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
<permission name="android.permission.INVOKE_CARRIER_SETUP"/>
<permission name="android.permission.LOCAL_MAC_ADDRESS"/>
<permission name="android.permission.LOCATION_HARDWARE"/>
- <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+ <permission name="android.permission.LOCK_DEVICE"/>
<permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
<permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
<permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
@@ -331,12 +334,16 @@ It allows additional grants on top of privapp-permissions-platform.xml
<permission name="android.permission.RECOVER_KEYSTORE"/>
<permission name="android.permission.RECOVERY"/>
<permission name="android.permission.REGISTER_CALL_PROVIDER"/>
+ <permission name="android.permission.REMOTE_DISPLAY_PROVIDER"/>
+ <permission name="android.permission.RESET_PASSWORD"/>
<permission name="android.permission.SCORE_NETWORKS"/>
<permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
<permission name="android.permission.SET_TIME"/>
<permission name="android.permission.SET_TIME_ZONE"/>
+ <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<permission name="android.permission.START_TASKS_FROM_RECENTS"/>
<permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+ <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
<permission name="android.permission.TETHER_PRIVILEGED"/>
<permission name="android.permission.UPDATE_APP_OPS_STATS"/>
<permission name="android.permission.USE_RESERVED_DISK"/>
@@ -437,14 +444,25 @@ It allows additional grants on top of privapp-permissions-platform.xml
<permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
</privapp-permissions>
+ <privapp-permissions package="com.google.android.permissioncontroller">
+ <permission name="android.permission.MANAGE_USERS"/>
+ <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
+ <permission name="android.permission.GET_APP_OPS_STATS"/>
+ <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
+ <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>
+ <permission name="android.permission.APPROVE_INCIDENT_REPORTS"/>
+ <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+ <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
+ </privapp-permissions>
+
<privapp-permissions package="com.google.android.packageinstaller">
- <permission name="android.permission.CLEAR_APP_CACHE"/>
<permission name="android.permission.DELETE_PACKAGES"/>
<permission name="android.permission.INSTALL_PACKAGES"/>
+ <permission name="android.permission.USE_RESERVED_DISK"/>
<permission name="android.permission.MANAGE_USERS"/>
- <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
<permission name="android.permission.UPDATE_APP_OPS_STATS"/>
- <permission name="android.permission.USE_RESERVED_DISK"/>
+ <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+ <permission name="android.permission.PACKAGE_USAGE_STATS"/>
</privapp-permissions>
<privapp-permissions package="com.google.android.partnersetup">
@@ -488,11 +506,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
<permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
<permission name="android.permission.REBOOT"/>
- <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
<permission name="android.permission.SET_TIME"/>
<permission name="android.permission.SET_TIME_ZONE"/>
<permission name="android.permission.SHUTDOWN"/>
<permission name="android.permission.STATUS_BAR"/>
+ <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+ <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
<permission name="android.permission.WRITE_APN_SETTINGS"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
</privapp-permissions>
@@ -576,10 +595,14 @@ It allows additional grants on top of privapp-permissions-platform.xml
</privapp-permissions>
<privapp-permissions package="com.google.android.apps.wellbeing">
+ <permission name="android.permission.ACCESS_INSTANT_APPS"/>
+ <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
<permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
+ <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
<permission name="android.permission.MODIFY_PHONE_STATE"/>
<permission name="android.permission.OBSERVE_APP_USAGE"/>
<permission name="android.permission.PACKAGE_USAGE_STATS"/>
+ <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
<permission name="android.permission.SUSPEND_APPS"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/> |
I've switched to use your opengapps_aosp_build repo instead and applied the patch. Regarding the packages I've defined following in
Downloaded following apks:
And created some folders and copied the apks to those folders:
I am not so sure if that is all correct therefore I am posting it, at least aosp 10 with opengapps included is currently building and had no error yet :-) |
we do not support or provide opengapps |
@stefanhh0 You can put the configuration in As for the APKs; I have taken them directly from a GSI for pixel. Back when I checked all those "hosts" still had apks for SDK version Other than that you copied permissioncontroller to a folder/file named |
@jerpelea sorry for being off-topic here with the opengapps. I guess re-opening the issue was not intended, right? I am closing it again. @MarijnS95 thanks for the hints, moved the config to the customization make file.
I found as well a Verified with the So now I am nearly ready to go. However I've seen that yoshino was switched to 4.14 kernel a few hours ago and a new oem.img is required in case I want to flash. Do you already know when that will be released? Looking forward to it! Kind regards, |
@stefanhh0 I've taken them from a crosshatch image, but sargo should be okay/equivalent. I can't remember As for the kernel, manually switch it back to 4.9 for now. I've been doing the Q transition (not entirely on my own, thank Felix for a lot of continued research and commits during the preview stages) simultaneously to Alin and the rest doing 4.14, and due to time constraints we basically had to merge the two together without creating Android-10 4.9 compatibility branches (even though reverting a few things and putting that on a separate branch won't be too much work...). We will see when the new oem image drops, but I doubt it will be immediately stable and complete seeing how much work goes into supporting 18 devices across 7 different platforms. If you want to use your Lilac as DD, stick with 4.9 for now. |
Okay, switching to the |
When calling ./repo_sync I've observed two warnings:
|
the first release is an alpha release and it is intended to be used to fix kernel bugs since many features are buggy or not implemented |
@stefanhh0 Pretty sure that the second warning belongs to the followup fwb commit. It's nothing fatal, just that there have been too many file changes inbetween the cherry-picked commit and your |
Wyzco pointed out that there is a SW_binaries_for_Xperia_Android_10.0.7.1_r1_v1a_yoshino.img so I have build yesterday the android-10 as is, which worked fine and flashed it, unfortunately the phone was stuck on the white sony logo when I tried to boot into it, so I couldn't get any logs from that build (tried to boot several times). I am aware that this is all at a very early experimental state ;-) Since I had an android-10 build from 19th with 4.9 kernel, flashed that one as well today alongside with the SW_binaries_for_Xperia_Android_9.0_2.3.2_v9_yoshino.img. It booted a little better and I had some logcat output with different errors. Haven't saved it because I thought okay, go on try a new build. So I tried to build android-10 with current sources but it failed here:
For building it I use a hand-made script to adjust the required things, maybe there is an easy fix for the problem available? If not, that would be totally okay, then I just wait a little longer for 4.14 :-) |
android 10 build guide is not out ! the binaries are alpha and should be used for kernel fixes ! |
@stefanhh0 I don't know why @wyzco would tell you that, because it's an internal preview for kernel 4.14. Afaik it's not supposed to be shared around since it's an early alpha (hence the Your script is not setting the display repository back to the 7.3 branch like you've done earlier this week, hence the error (and don't forget the other repos as said earlier this week). |
@MarijnS95, yes I've forgotten to include the 7.3 changes in the script I have moved them now to my local_manifests.patch: .repo/local_manifests$ git diff
diff --git a/qcom.xml b/qcom.xml
index 7077e28..402bc23 100644
--- a/qcom.xml
+++ b/qcom.xml
@@ -9,7 +9,7 @@
<project path="hardware/qcom/gps" name="platform/hardware/qcom/sdm845/gps" remote="aosp" groups="qcom_sdm845" revision="master" />
-<project path="hardware/qcom/display/sde" name="hardware-qcom-display" groups="device" remote="sony" revision="aosp/LA.UM.7.1.r1" />
+<project path="hardware/qcom/display/sde" name="hardware-qcom-display" groups="device" remote="sony" revision="aosp/LA.UM.7.3.r1" />
<project path="hardware/qcom/media/sm8150" name="hardware-qcom-media" groups="device" remote="sony" revision="aosp/LA.UM.7.1.r1" />
<project path="hardware/qcom/media/sdm845" name="platform/hardware/qcom/sdm845/media" groups="qcom_sdm845" remote="aosp" revision="master" />
@@ -21,8 +21,7 @@
<project path="vendor/qcom/opensource/dataservices" name="vendor-qcom-opensource-dataservices" groups="device" remote="sony" revision="master" />
<project path="vendor/qcom/opensource/location" name="vendor-qcom-opensource-location" groups="device" remote="sony" revision="p-mr0" />
<project path="vendor/qcom/opensource/wlan" name="hardware-qcom-wlan" groups="device" remote="sony" revision="master" />
-<project path="vendor/qcom/opensource/display-commonsys-intf" name="vendor-qcom-opensource-commonsys-intf-display" groups="device" remote="sony" revision="aosp/LA.UM.7.1.r1" />
-<project path="vendor/qcom/opensource/interfaces" name="vendor-qcom-opensource-interfaces" groups="device" remote="sony" revision="aosp/LA.UM.7.1.r1" >
+<project path="vendor/qcom/opensource/interfaces" name="vendor-qcom-opensource-interfaces" groups="device" remote="sony" revision="aosp/LA.UM.7.3.r1" >
<linkfile dest="vendor/qcom/opensource/Android.bp" src="os_pickup.bp" />
</project>
</manifest> Also updated the build.sh to also include most of your PRs I have checked via git log that the cherry-picking works as expected... Although the conflict resolving needed to be a little harsh because of a conflict I've encountered. Now it stops here:
|
More changes have trickled in over time. this is holding your build back right now. |
Device: Lilac Succesfully build it, flashed it and booted into it. Since the build with opengapps was pretty unstable, I've decided to give it a try with pure aosp. However it is as well not very stable. Additionally when I have to enter the SIM PIN the display is very slow, after I manage to log in, the display reacts then normally until the phone reboots. I have pulled several files: dmesg after boot b: dmesg-2.log |
@MarijnS95 I am now back to aosp 9r46, since 10 is not yet usable for me. However if you want me to test more just let me know. I have learned quite a few things during this session and with my new script it is easy to include various pull requests from you and others :-) Cheers, |
@stefanhh0 Unfortunately there's nothing obvious in the logs pointing to a crash, apart FPC gestures being very close to the end of the logs. I don't know if you are cherry-picking them to test the feature (and have been using it before on Android 9) or because I mentioned taking in a couple PRs of mine. In the latter case I observed a similar pattern on other devices. Somehow the high frequency or contents of TA calls (to the fingerprint trust-app) trip something in the TZ, crashing the entire system. Unfortunately without the usual stacktrace that shows up in pstore. In any case you don't need most of my PRs to run 10 anymore (most have been merged), those are just open for testing/discussion (or have yet to be reworked). I am glad to see them tested, but let's bring it down to a minimal running state for Q. If that works we have yet another reason why Sony has not provided fingerprint gestures on any phone so far. Finally, naming of opengapps apks. You seem to be copying them to the target directory, leaving the name of the file. Instead, opengapps uses either the sdk number ( |
@MarijnS95 so finally I am there and AOSP 10 is running with 4.9 kernel and opengapps fine on my phone. Updated the build script in #456 (comment) accordingly and only pulling in the one open PR regarding transpower from you. Additionally regarding opengapps, fixed the copying of the apk's and verified it via aapt dump badging in the out folder. So it seems to be always the versionCode that the apks have to be named to. It wasn't even required to clear my userdata in order to getting aosp 10 running, thats pretty cool! It crashed once though already. But not so sure if that is really because of 10 or a general problem of the kernel I am using, since I've also reported crashes on 9 and it was again one of those when the double reboots happen. An android 10 issue seems to be when entering the SIM PIN. The display takes the input very slow... there seems to be an unfixed issue with that, can you confirm that? Btw. you mentioned once in another thread that you may going to setup android 10 branches with Kernel 4.9 and also Alin told us it may take very long to stabilize 4.14. It would be pretty nice if you can afford the capacity to setup 4.9 kernel together with android 10. Is it okay to open already new aosp 10 bugs if I encounter them with my current constellation? Thanks again I am happy that I finally got android 10 working for me! Cheers, Stefan |
@stefanhh0 Great to hear! Is there anything odd in the logs? Does turning the screen off and on change the situation? Does the slowness persist anywhere else in the system? I have not encountered it yet on any of the devices tested. Unfortunately I don't own a Yoshino, though I seriously doubt that particular device with Android 10 specifically runs into such an odd issue. I strongly doubt it's framework/systemui related if the rest works flawless, so perhaps something happens in RIL. But then, the PIN is only sent off when clicking ok, not a second earlier... I can set up a manifest branch with references to forks, and revert everything related to 4.14. After all I'll be running the same setup for the coming months, until 4.14 becomes stable enough to use on a daily driver. However, it's going to be quite a PITA since I have a ton of in-progress features locally and some on forks. Expect hit-and-miss when it comes to forgetting a commit here and there, or keeping it updated every day. I won't be able to test that exact configuration, which is exactly the reason why Alin is holding off yet another branch that we need to keep in working order. I'll see about adding it in the next 2-3 days, depending on my schedule. As for bugs, I think everyone is fine reporting them on the bug_tracker as long as the kernel and Android version are included. That way we can more easily figure out where the issue is. |
Regarding the slowness I'll keep your questions in mind and will go through it soon... it happens only when entering the SIM PIN... afterwards everything runs at normal speed. So, all in all it is kind of harmless thing and not a big issue. Well, anyway I'll then open a separate issue with logs and so forth since this thread is closed anyway and already a little cluttered. Would be really cool with the xtra branches. I'd try to help in testing it anyway since I like to build fresh things. I have setup CCACHE_EXEC for faster results when rebuilding. For now I just try to keep up with the changes and update my build.sh accordingly whenever required. I try to keep an eye on what is being done and what is in progress in order to not cause too much noise for you all. |
Yes, it seems to be the workaround :-) One more question, I know again off-topic as with opengapps. Are you running successfully Magisk and/or TWRP. While TWRP works in general, it seems not to be able to mount the aosp 10 partitions any longer. Thus I can't install Magisk. Well not too much of an issue but I like |
I hope you saved a dmesg+logcat so that we can see if drm/composer is screaming like crazy 😁 Well, no clean builds here and definitely no clean checkouts ( I haven't bothered to flash/boot TWRP since owning Android 10 (I would build it locally back when using Omnirom), and install Magisk the "hard" way. Cutting corners, as I usually either push the built bootimage or |
@MarijnS95, Btw. tried several approaches to get that magisk running but it somehow likes to truncate the boot.img at around 15M when trying the dd approach. also patching the sparse boot.img from the build and then flashing that one leads to a none booting system. However although I have installed the apk from Magisk-v19.4.zip, the Magisk Manager apk itself uses then surprisingly Magisk-v19.3.zip to patch the img. I guess that is the problem... Well, just wanted to to let you know. I try to get it patched by hand using Magisk-v19.4 and/or I am going to ask the devs from magisk about it. |
@stefanhh0 Do you mean the initial bootimage (that you either acquire with Don't worry about the number. Someone found it a good idea to not store the version in the git repository. I compile Magisk myself, and always have to check what the most recent version is and fill that in the untracked |
I've updated the build.sh and published it here: @MarijnS95 |
Android version: android-10.0.0_r1
Description
When trying to switch to android-10.0.0_r1
I had to remove following lines from:
.repo/local_manifests/untracked.xml
repo sync --force-sync -j8
repo init -b android-10.0.0_r1
Worked after removing the no longer available repos from untracked.xml.
However when trying to run repo_update.sh I got some additional problems:
The text was updated successfully, but these errors were encountered: