Skip to content

Commit

Permalink
manifest: Reduce deltas between Omni and AOSP
Browse files Browse the repository at this point in the history
Also organize/optimize the OmniROM projects list.

Adapt for android-8.0.0_r4:

- add more projects
- return to "android_vendor_omni"
	- replication is fixed

Signed-off-by: Humberto Borba <[email protected]>
Change-Id: I06b40edbeb60a5a9e55079b0c6372fb9524be285
Signed-off-by: Jacob Whatley <[email protected]>
  • Loading branch information
humberos authored and Jacob Whatley committed Aug 22, 2017
1 parent caf165e commit dab8d81
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 0 deletions.
3 changes: 3 additions & 0 deletions default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -599,4 +599,7 @@

<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />

<!-- OmniROM -->
<include name="omni-default.xml" />

</manifest>
11 changes: 11 additions & 0 deletions omni-aosp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>

<remote name="github"
fetch="https://github.com/" />

<remote name="omnirom"
fetch="https://github.com/omnirom"
review="gerrit.omnirom.org" />

</manifest>
15 changes: 15 additions & 0 deletions omni-default.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>

<!-- FIRST: Remove unused/forked AOSP Projects -->
<include name="remove.xml" />

<!-- Include forked AOSP -->
<include name="omni-aosp.xml" />

<!-- OmniROM Projects -->
<project path="android" name="android" remote="omnirom" revision="android-8.0" />

<project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-8.0" />

</manifest>
69 changes: 69 additions & 0 deletions remove.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>

<remove-project name="platform/developers/build" />
<remove-project name="platform/developers/demos" />
<remove-project name="platform/developers/samples/android" />

<remove-project name="platform/development" />

<remove-project name="platform/docs/source.android.com" />

<remove-project name="device/asus/fugu" />
<remove-project name="device/asus/fugu-kernel" />
<remove-project name="device/common" />
<remove-project name="device/generic/arm64" />
<remove-project name="device/generic/armv7-a-neon" />
<remove-project name="device/generic/car" />
<remove-project name="device/generic/common" />
<remove-project name="device/generic/goldfish" />
<remove-project name="device/generic/goldfish-opengl" />
<remove-project name="device/generic/mips" />
<remove-project name="device/generic/mips64" />
<remove-project name="device/generic/mini-emulator-arm64" />
<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
<remove-project name="device/generic/mini-emulator-mips" />
<remove-project name="device/generic/mini-emulator-mips64" />
<remove-project name="device/generic/mini-emulator-x86" />
<remove-project name="device/generic/mini-emulator-x86_64" />
<remove-project name="device/generic/qemu" />
<remove-project name="device/generic/x86" />
<remove-project name="device/generic/x86_64" />
<remove-project name="device/google/accessory/arduino" />
<remove-project name="device/google/accessory/demokit" />
<remove-project name="device/google/atv" />
<remove-project name="device/google/contexthub" />
<remove-project name="device/google/dragon" />
<remove-project name="device/google/dragon-kernel" />
<remove-project name="device/google/marlin" />
<remove-project name="device/google/marlin-kernel" />
<remove-project name="device/google/vrservices" />
<remove-project name="device/huawei/angler" />
<remove-project name="device/huawei/angler-kernel" />
<remove-project name="device/lge/bullhead" />
<remove-project name="device/lge/bullhead-kernel" />
<remove-project name="device/linaro/bootloader/arm-trusted-firmware" />
<remove-project name="device/linaro/bootloader/edk2" />
<remove-project name="device/linaro/bootloader/OpenPlatformPkg" />
<remove-project name="device/linaro/hikey" />
<remove-project name="device/linaro/hikey-kernel" />
<remove-project name="device/sample" />

<remove-project name="platform/hardware/intel/audio_media" />
<remove-project name="platform/hardware/intel/bootstub" />
<remove-project name="platform/hardware/intel/common/bd_prov" />
<remove-project name="platform/hardware/intel/common/libmix" />
<remove-project name="platform/hardware/intel/common/libstagefrighthw" />
<remove-project name="platform/hardware/intel/common/libva" />
<remove-project name="platform/hardware/intel/common/libwsbm" />
<remove-project name="platform/hardware/intel/common/omx-components" />
<remove-project name="platform/hardware/intel/common/utils" />
<remove-project name="platform/hardware/intel/common/wrs_omxil_core" />
<remove-project name="platform/hardware/intel/img/hwcomposer" />
<remove-project name="platform/hardware/intel/img/psb_headers" />
<remove-project name="platform/hardware/intel/img/psb_video" />
<remove-project name="platform/hardware/intel/sensors" />

<remove-project name="kernel/tests" />

</manifest>

0 comments on commit dab8d81

Please sign in to comment.