3236-Q-Lineage 17.1 merge conflict fix
Description
Merge conflict occurs in v1-q branch due to changes in lineage-17.1 branch. lineage-17.1 recently move to android.bp build system
- resolve the merge conflict
- resolve lineage os sdk reference not found in android.bp file
Issue(s)
Test procedures
Test environment
- Build apk with
APP_NAME=ExactCalculator,FEATURE_BRANCH=3236-Q-lineage_17_1_merge_conflict - Install the apk into device & run.
Steps
| Action | Expected result |
|---|---|
| Navigate through app | All components should work fine |
| Switch device to dark-mode | All components should be in dark-mode color |
Expected result
All functionality should work fine
Technical details
Screenshots
Check list
-
Self review -
Test procedure explained -
Tested on fresh install -
Tested applied as an update -
License -
Internal documentation -
User documentation