resolve merge conflicts of ad750e09ed0bd6698842212208d08908b8b281fa to sc-dev

Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Bug: 185209711
Change-Id: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
tree: 66715bc2085b1d9506a6645bd9cabf06a67d3e33
  1. build/
  2. java/
  3. sdk/
  4. Android.bp
  5. generate_ml_bundle.sh
  6. MODULES_OWNERS
  7. OWNERS
  8. PREUPLOAD.cfg
  9. README.md
README.md

packages/modules/common

This project includes mainline build and other utility code. Any library code intended for use by modules should go in frameworks/libs/modules-utils instead.

java code

This project uses a single source path for java code. All java code should go in the java directory with subdirectories corresponding to the java package. Android.bp files should go alongside the java source files, and should only include java source for a single java package to encourage good code hygiene.

Tests for java code should go in the javatests directory and follow the same structure.