Skip to content
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

[chrome.ndk]: accumulated patches in one PR #1

Merged
merged 4 commits into from
Mar 5, 2023

Conversation

unicornx
Copy link
Contributor

@unicornx unicornx commented Mar 3, 2023

Details please check the commitment comments.

When run build_ffmpeg.py for ffmpeg, it requires toolchain under
android NDK path. Check build_ffmpeg.py:

```python
clang_toolchain_dir = NDK_ROOT_DIR + '/toolchains/llvm/prebuilt/linux-x86_64/'
```

So we add two symbol links to bin & lib. Note we don't add actual
toolchain into this repo due to size limition of github.
Using symbol link is also flexiable so we can point to any
toolchain we'd like.

Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
We used symobl link before, but now we have to use the actual files
due to we need to use 29 as API level, not 10000.
The files are from
https://android.googlesource.com/toolchain/prebuilts/sysroot/platform/riscv64-linux-android
commitID: 4d904c09ba07c18cad5fafe6fa10440c35071f24
Plus libc+ libraries, which are required when building clang_rt libs
for riscv64. Now just copy them from Thead ndk.

The reason why we can not use 1000 is: when building
media/audio/audio/opensles_input.o, error occurred:
```
../../media/audio/android/opensles_input.cc:206:7:
error: 'slCreateEngine' is deprecated: first deprecated
in Android 30 [-Werror,-Wdeprecated-declarations]
      slCreateEngine(engine_object_.Receive(), 1, option, 0, nullptr, nullptr),
      ^
```

I don't want to change the source file, I want to change API level here
instead.

Note, still keep the 10000, because I don't want to change build script
for clang. Check <aosp-riscv/chromium#10>.

Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
@unicornx unicornx requested a review from McKnight22 March 3, 2023 12:51
@unicornx unicornx self-assigned this Mar 3, 2023
Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
unicornx added a commit to unicornx/chromium that referenced this pull request Mar 3, 2023
Regarding the reason, check aosp-riscv/android-ndk-ci#1
"Copied actual riscv64 sysroot into this repo"

Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
unicornx added a commit to aosp-riscv/chromium that referenced this pull request Mar 5, 2023
Regarding the reason, check aosp-riscv/android-ndk-ci#1
"Copied actual riscv64 sysroot into this repo"

Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
@unicornx unicornx merged commit f1c9b55 into aosp-riscv:main Mar 5, 2023
@unicornx unicornx deleted the dev-branch branch March 5, 2023 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants