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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
Mar 5, 2023
Merged

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

merged 4 commits into from
Mar 5, 2023

Commits on Mar 3, 2023

  1. added clang toolchain 

    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>
    @unicornx
    unicornx committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    949c7a8 View commit details
    Browse the repository at this point in the history

  2. removed symbol link of riscv64 sysroot 

    Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
    @unicornx
    unicornx committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    62087d3 View commit details
    Browse the repository at this point in the history

  3. Copied actual riscv64 sysroot into this repo. 

    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 committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    14c5792 View commit details
    Browse the repository at this point in the history

  4. update README.md 

    Signed-off-by: Wang Chen <wangchen20@iscas.ac.cn>
    @unicornx
    unicornx committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    40fe97c View commit details
    Browse the repository at this point in the history