lineage-rockchip/android_external_drm_hwcomposer
1
0
Fork 0
Code Activity Actions

drm_hwcomposer: Fix build_deploy script and switch it to hwc3

Browse source 
New aospless file requires `install` target instead of `all`.

Change-Id: I5014d3b8bd3120c699c12c4a04a1d20c63ec8330
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
This commit is contained in:
Roman Stratiienko 2024-11-27 23:23:57 +02:00
parent 445ef202e5
commit 2852f7d46d
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -59,7 +59,7 @@ ci: ## Run presubmit within the docker container
@echo "\n\e[32m --- SUCCESS ---\n" @echo "\n\e[32m --- SUCCESS ---\n"
ci_cleanup: ## Cleanup after 'make ci' ci_cleanup: ## Cleanup after 'make ci'
$(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "make -f .ci/Makefile clean " $(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "make -f .ci/Makefile clean"
$(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "rm -rf ~/aospless/build" $(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "rm -rf ~/aospless/build"
$(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "rm -rf ~/aospless/install" $(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "rm -rf ~/aospless/install"
$(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "rm -rf ~/aospless/out_src" $(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "rm -rf ~/aospless/out_src"
@ -69,14 +69,11 @@ build_deploy: ## Build for Andoid and deploy onto the target device (require act
$(if $(filter $(shell adb shell getprop ro.bionic.arch),arm64),,$(error arm64 only is supported at the moment)) $(if $(filter $(shell adb shell getprop ro.bionic.arch),arm64),,$(error arm64 only is supported at the moment))
adb root && adb remount vendor adb root && adb remount vendor
mkdir -p .out/arm64 mkdir -p .out/arm64
$(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "make -C ~/aospless all" $(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "make -C ~/aospless install"
$(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "cp -r ~/aospless/install/* ~/drm_hwcomposer/.out/arm64" $(DOCKER_BIN) exec -it $(IMAGE_NAME) bash -c "cp -r ~/aospless/install/* ~/drm_hwcomposer/.out/arm64"
adb push .out/arm64/vendor/lib64/hw/hwcomposer.drm.so /vendor/lib64/hw/hwcomposer.drm.so adb push .out/arm64/vendor/bin/hw/android.hardware.composer.hwc3-service.drm /vendor/bin/hw/android.hardware.composer.hwc3-service.drm
adb shell stop adb shell stop
adb shell stop vendor.hwcomposer-2-1 && adb shell start vendor.hwcomposer-2-1 || true adb shell stop vendor.hwcomposer-3 && adb shell start vendor.hwcomposer-3 || true
adb shell stop vendor.hwcomposer-2-2 && adb shell start vendor.hwcomposer-2-2 || true
adb shell stop vendor.hwcomposer-2-3 && adb shell start vendor.hwcomposer-2-3 || true
adb shell stop vendor.hwcomposer-2-4 && adb shell start vendor.hwcomposer-2-4 || true
bash -c '[[ "$$HWCLOG" -eq "1" ]] && adb logcat -c || true' bash -c '[[ "$$HWCLOG" -eq "1" ]] && adb logcat -c || true'
adb shell start adb shell start
bash -c '[[ "$$HWCLOG" -eq "1" ]] && adb logcat | grep -i hwc || true' bash -c '[[ "$$HWCLOG" -eq "1" ]] && adb logcat | grep -i hwc || true'