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

Merge upstream & add separated init file #1

Merged
merged 43 commits into from
Aug 12, 2019

Conversation

peat-psuwit
Copy link

This PR does 2 things.

  1. Merge upstream from mer-hybris. This brings support for newer Android version, including Android 7.1.
  2. Add a separated init file for Android 7 and up. This way, the main init.rc doesn't have to be patched.

I'm not sure which branch should I target. I would recommend merging into master then change the manifest to point to master branch too as the same tree builds on all Android version.

Andrew Branson and others added 30 commits May 17, 2017 12:31
Change-Id: I343ccbe8c8d6c4afb55604952b9a4a99c6addca5
[lib64] Allow for 64-bit libaudioflingerglue. Contributes JB#38376
Add support for Android 7 based ports. Fixes Mer#1732.
Resulting .so file is installed to lib or lib64 based on the arch, we
need to update the path in hybris.c accordingly.
Use correct path for .so with 64 bit arch.
If android target architecture is 64bit and our local system is not,
append _32 to libaudioflingerglue target.
Some targets may need device specific defines, to get them from central
location we copy android-config.h during build phase to audioflingerglue
source directory. To be able to do local builds create empty header as a
placeholder.
…ices. JB#40476

By specifying USE_32BIT_MINIAF in android-config.h, i.e.:

    #define USE_32BIT_MINIAF true
allow miniaf to be built as 32 bits and add custom services header
[audioflingerglue] fix/simplify obs build (and simplify local build).
[audioflinger] Droid 7.0 services with custom version. JB#41180
Decide whether to build 32 bit or 64 bit mini-services based on the
LOCAL_32_BIT_ONLY flag in frameworks/av/media/mediaserver/Android.mk.
Fixes from JB#41777 need to be merged before this one, then this needs
to be tested locally and on obs, to make sure nothing breaks.
Change-Id: Ief047befed3e0d828cc17fc72cd49af1c930471e
[audioflingerglue] Add support for Android 8 based ports. MER#1914
By externalising the logic into a reusable script.

Signed-off-by: Simonas Leleiva <[email protected]>
[audioflingerglue] Add custom headers for Android 6.0 JB#41519
[32bit] simplify 32/64 bit builds. JB#41774
sledges and others added 13 commits June 25, 2018 08:51
Enable target autodetection for local builds too
[arch] Temporarily fix android arch detection. JB#41774
…ut use droid-make or droid-cmd if available. JB#42355
[arch] detect_build_targets can take 2nd argument for android arch, but use droid-make or droid-cmd if available. JB#42355
[audioflinger] Correct method signatures for Android 7.0.0. JB#43145
Droid 7.1 services custom version
Change-Id: Ic9e7b3428495bf0fb7e3034ce4ccb47f2c794360
Change-Id: I5ac4bf22bbbf203e5318d3ba7ffd2d6f740bfde1
@Vince1171 Vince1171 requested a review from fredldotme August 11, 2019 19:30
@fredldotme
Copy link

LGTM as it is. Regarding the target branch, we probably should follow the rest of the Halium-specific repos and branch master into halium-{5.1,7.1} as needed.

@fredldotme fredldotme merged commit dcb2d2a into Halium:master Aug 12, 2019
peat-psuwit pushed a commit to peat-psuwit/audioflingerglue that referenced this pull request May 27, 2020
debian: mark audioflingerglue-dev as Multi-Arch: foreign
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.

7 participants