General cleanup #701

ix5 · 2020-03-06T19:02:57Z

Does this spark joy? I hope this sparks you for you!

hardware: ssc: Convert .mk to .bp

It's cleaner and faster to parse.

rootdir: Correct km4 init module name

The module is only shipping an init file, not an executable. Clear up this confusion my appending .rc to its module name.

rootdir: rdclean: Remove duplicate guard

The module will only be added for userdebug/eng builds in common.mk anyway.

rootdir: Make PLATFORM guards more logical

Having this makes little sense:

if (A && B && C)
if (B && C)
<add-stuff>
endif
<add-more-stuff>
endif

Rather, change it to:

if (B && C)
<add-stuff>
endif

if (A && B && C)
<add-more-stuff>
endif

rootdir: Drop msm8916 from guard for qmuxd.rc

This platform is not included in SODP Q.

rootdir: Convert .mk to .bp

Since soong doesn't know about templated module names, init.$(TARGET_DEVICE).rc and init.recovery.$(TARGET_DEVICE) stay as .mk.

Also, any module that is conditionally included on TARGET_* vars is left as-is.

rootdir: sscrdpcd.rc: Only for sdm845,sm8150

The service is not used by sdm660 and msm8998.

TODO

health: vintf_fragments for manifest
rootdir: Move guards to common-init

common-init.mk

hardware/time-services/time_genoff.h

MarijnS95

Note that this breaks quite a few things. As you know product files (lowercase in our repos) are parsed first, then BoardConfig and descendants (CamelCase). Finally, module targets are read from Android.{bp,mk}, where these variables are available.

This PR moves all checking to common-init where the variables TARGET_NEEDS_AUDIOPD, WIFI_DRIVER_BUILT, TARGET_USES_TAD_V2 and TARGET_BOARD_PLATFORM are not defined yet. These will be defined later in the BoardConfig chain.

What do you reckon, should we clean up all platform/device files and move such simple, static declarations to the ~~device~~ product include chain? Some are there already anyway, while others live on in BoardConfig.

hardware/firmware/Android.mk

ix5 · 2020-03-07T17:11:40Z

~~This PR is dependent on a reorganization of the device makefiles, defining variables earlier in lowercase device.mk-inherited makfiles.~~

For now, the guards aren't touched. Will have to be addressed later.

MarijnS95

Found some more breaking changes. But the final diff between vendor images for different devices start to align now, finally 😉

common-init.mk

rootdir/Android.bp

jerpelea

do not remove the time services

jerpelea

sscrpcd should not be added to sdm660 adn msm8998
this service is used only by the sdm845 and sm8150

ix5 · 2020-03-09T19:52:50Z

sscrpcd should not be added to sdm660 adn msm8998
this service is used only by the sdm845 and sm8150

As it currently stands, sscrpd is included for msm8998 and later
ifneq ($(filter sdm660 msm8998 sdm845 sm8150,$(TARGET_BOARD_PLATFORM)),)
https://github.com/sonyxperiadev/device-sony-common/blob/master/rootdir/Android.mk#L320-L363

I can remove the init for 660 and 8998 though.

do not remove the time services

Ok

jerpelea · 2020-03-10T08:12:41Z

sscrpcd should not be added to sdm660 adn msm8998
this service is used only by the sdm845 and sm8150

As it currently stands, sscrpd is included for msm8998 and later
ifneq ($(filter sdm660 msm8998 sdm845 sm8150,$(TARGET_BOARD_PLATFORM)),)
https://github.com/sonyxperiadev/device-sony-common/blob/master/rootdir/Android.mk#L320-L363

I can remove the init for 660 and 8998 though.

do not remove the time services

Ok

please do the blobs are not prezent on those devices

The service is not used by sdm660 and msm8998. See: sonyxperiadev#701 (review)

ix5 · 2020-05-23T15:22:50Z

Pushed with less breaking changes

ix5 · 2020-05-26T18:02:24Z

This pulls in #734 as well

MarijnS95 · 2020-05-26T23:00:30Z

@ix5 Can you pull in #735 too?

The service is not used by sdm660 and msm8998. See: sonyxperiadev#701 (review)

It's cleaner and faster to parse.

The module is only shipping an init file, not an executable. Clear up this confusion my appending .rc to its module name.

The module will only be added for userdebug/eng builds in common.mk anyway.

Having this makes little sense: ``` if (A && B && C) if (B && C) <add-stuff> endif <add-more-stuff> endif ``` Rather, change it to: ``` if (B && C) <add-stuff> endif if (A && B && C) <add-more-stuff> endif ``` ...to improve readability.

This platform is not included in SODP Q.

Since soong doesn't know about templated module names, `init.$(TARGET_DEVICE).rc` and `init.recovery.$(TARGET_DEVICE)` stay as .mk. Also, any module that is conditionally included on `TARGET_*` vars is left as-is.

ix5 · 2020-05-27T15:23:24Z

Rebased on top of latest changes

jerpelea · 2020-05-28T07:10:20Z

cherry-picked

ix5 force-pushed the general-cleanup branch from dad0910 to a111127 Compare March 6, 2020 20:29

MarijnS95 reviewed Mar 6, 2020

View reviewed changes

common-init.mk Outdated Show resolved Hide resolved

ix5 force-pushed the general-cleanup branch from a111127 to 181b54e Compare March 6, 2020 22:55

ix5 commented Mar 6, 2020

View reviewed changes

hardware/time-services/time_genoff.h Outdated Show resolved Hide resolved

MarijnS95 suggested changes Mar 7, 2020

View reviewed changes

MarijnS95 reviewed Mar 7, 2020

View reviewed changes

hardware/firmware/Android.mk Outdated Show resolved Hide resolved

ix5 force-pushed the general-cleanup branch from 181b54e to 45fa33a Compare March 7, 2020 16:40

MarijnS95 suggested changes Mar 7, 2020

View reviewed changes

common-init.mk Outdated Show resolved Hide resolved

rootdir/Android.bp Outdated Show resolved Hide resolved

jerpelea reviewed Mar 9, 2020

View reviewed changes

ix5 force-pushed the general-cleanup branch from 45fa33a to 1b6af5d Compare May 2, 2020 22:48

ix5 force-pushed the general-cleanup branch from 1b6af5d to e7fd9c6 Compare May 23, 2020 15:14

ix5 added a commit to ix5/device-sony-common that referenced this pull request May 23, 2020

rootdir: sscrdpcd.rc: Only for sdm845,sm8150

a20c9a1

The service is not used by sdm660 and msm8998. See: sonyxperiadev#701 (review)

ix5 force-pushed the general-cleanup branch from a20c9a1 to 5880e7e Compare May 26, 2020 17:38

ix5 changed the title ~~[WIP/DNM] General cleanup~~ General cleanup May 26, 2020

ix5 marked this pull request as ready for review May 26, 2020 18:04

ix5 force-pushed the general-cleanup branch 2 times, most recently from baaae9b to 71fd337 Compare May 26, 2020 18:14

MarijnS95 pushed a commit to MarijnS95/device-sony-common that referenced this pull request May 27, 2020

rootdir: sscrdpcd.rc: Only for sdm845,sm8150

55f133e

The service is not used by sdm660 and msm8998. See: sonyxperiadev#701 (review)

ix5 added 5 commits May 27, 2020 17:17

hardware: ssc: Convert .mk to .bp

2c1422e

It's cleaner and faster to parse.

rootdir: Correct km4 init module name

7316bdf

The module is only shipping an init file, not an executable. Clear up this confusion my appending .rc to its module name.

rootdir: rdclean: Remove duplicate guard

b8b14a1

The module will only be added for userdebug/eng builds in common.mk anyway.

rootdir: Make PLATFORM guards more logical

63e5cd4

Having this makes little sense: ``` if (A && B && C) if (B && C) <add-stuff> endif <add-more-stuff> endif ``` Rather, change it to: ``` if (B && C) <add-stuff> endif if (A && B && C) <add-more-stuff> endif ``` ...to improve readability.

rootdir: Drop msm8916 from guard for qmuxd.rc

0f20bf4

This platform is not included in SODP Q.

rootdir: Convert .mk to .bp

99521a2

Since soong doesn't know about templated module names, `init.$(TARGET_DEVICE).rc` and `init.recovery.$(TARGET_DEVICE)` stay as .mk. Also, any module that is conditionally included on `TARGET_*` vars is left as-is.

ix5 force-pushed the general-cleanup branch from 71fd337 to 99521a2 Compare May 27, 2020 15:17

ix5 closed this May 28, 2020

ix5 deleted the general-cleanup branch May 28, 2020 19:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

General cleanup #701

General cleanup #701

ix5 commented Mar 6, 2020 •

edited

Loading

MarijnS95 left a comment •

edited

Loading

ix5 commented Mar 7, 2020 •

edited

Loading

MarijnS95 left a comment

jerpelea left a comment

jerpelea left a comment •

edited

Loading

ix5 commented Mar 9, 2020 •

edited

Loading

jerpelea commented Mar 10, 2020

ix5 commented May 23, 2020

ix5 commented May 26, 2020

MarijnS95 commented May 26, 2020

ix5 commented May 27, 2020

jerpelea commented May 28, 2020

General cleanup #701

General cleanup #701

Conversation

ix5 commented Mar 6, 2020 • edited Loading

hardware: ssc: Convert .mk to .bp

rootdir: Correct km4 init module name

rootdir: rdclean: Remove duplicate guard

rootdir: Make PLATFORM guards more logical

rootdir: Drop msm8916 from guard for qmuxd.rc

rootdir: Convert .mk to .bp

rootdir: sscrdpcd.rc: Only for sdm845,sm8150

TODO

MarijnS95 left a comment • edited Loading

Choose a reason for hiding this comment

ix5 commented Mar 7, 2020 • edited Loading

MarijnS95 left a comment

Choose a reason for hiding this comment

jerpelea left a comment

Choose a reason for hiding this comment

jerpelea left a comment • edited Loading

Choose a reason for hiding this comment

ix5 commented Mar 9, 2020 • edited Loading

jerpelea commented Mar 10, 2020

ix5 commented May 23, 2020

ix5 commented May 26, 2020

MarijnS95 commented May 26, 2020

ix5 commented May 27, 2020

jerpelea commented May 28, 2020

ix5 commented Mar 6, 2020 •

edited

Loading

MarijnS95 left a comment •

edited

Loading

ix5 commented Mar 7, 2020 •

edited

Loading

jerpelea left a comment •

edited

Loading

ix5 commented Mar 9, 2020 •

edited

Loading