vendor/omni: minor code cleanup
Replaced tabs with four space, and alpabetized packages.mk
Change-Id: I846be29a6dfff81e01dacdf643846651d34a398a
diff --git a/config/common.mk b/config/common.mk
index 0a2a07b..040a132 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -2,18 +2,18 @@
# bootanimation
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/bootanimation/bootanimation.zip:system/media/bootanimation.zip
+ vendor/omni/prebuilt/bootanimation/bootanimation.zip:system/media/bootanimation.zip
# general properties
PRODUCT_PROPERTY_OVERRIDES += \
- keyguard.no_require_sim=true \
- ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
- ro.com.google.clientidbase=android-google \
- ro.com.android.wifi-watchlist=GoogleGuest \
- ro.setupwizard.enterprise_mode=1 \
- ro.com.android.dateformat=MM-dd-yyyy \
- ro.com.android.dataroaming=false \
- persist.sys.root_access=1
+ keyguard.no_require_sim=true \
+ ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
+ ro.com.google.clientidbase=android-google \
+ ro.com.android.wifi-watchlist=GoogleGuest \
+ ro.setupwizard.enterprise_mode=1 \
+ ro.com.android.dateformat=MM-dd-yyyy \
+ ro.com.android.dataroaming=false \
+ persist.sys.root_access=1
# enable ADB authentication if not on eng build
ifneq ($(TARGET_BUILD_VARIANT),eng)
@@ -29,8 +29,8 @@
# init.d support
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/init.d/00banner:system/etc/init.d/00banner \
- vendor/omni/prebuilt/bin/sysinit:system/bin/sysinit
+ vendor/omni/prebuilt/etc/init.d/00banner:system/etc/init.d/00banner \
+ vendor/omni/prebuilt/bin/sysinit:system/bin/sysinit
# userinit support
PRODUCT_COPY_FILES += \
@@ -42,7 +42,7 @@
# Enable SIP and VoIP on all targets
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
+ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
# Additional packages
-include vendor/omni/config/packages.mk
diff --git a/config/packages.mk b/config/packages.mk
index da9ce80..cc8c096 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -1,38 +1,37 @@
# Additional packages
PRODUCT_PACKAGES += \
- Development \
- LatinIME \
- VideoEditor \
- VoiceDialer \
- SoundRecorder \
- Basic
+ Basic \
+ Development \
+ LatinIME \
+ SoundRecorder \
+ VideoEditor \
+ VoiceDialer
# Additional apps
PRODUCT_PACKAGES += \
- Apollo \
- DashClock \
- DSPManager \
- libcyanogen-dsp \
- audio_effects.conf \
- MonthCalendarWidget \
- OpenDelta
+ Apollo \
+ audio_effects.conf \
+ DashClock \
+ DSPManager \
+ libcyanogen-dsp \
+ MonthCalendarWidget \
+ OpenDelta
PRODUCT_PACKAGES += \
- CellBroadcastReceiver
+ CellBroadcastReceiver
# Additional tools
PRODUCT_PACKAGES += \
- openvpn \
- e2fsck \
- mke2fs \
- tune2fs \
- bash \
- vim \
- nano \
- htop \
- powertop \
- lsof \
- mount.exfat \
- fsck.exfat \
- mkfs.exfat
-
+ bash \
+ e2fsck \
+ fsck.exfat \
+ htop \
+ lsof \
+ mke2fs \
+ mkfs.exfat \
+ mount.exfat \
+ nano \
+ openvpn \
+ powertop \
+ tune2fs \
+ vim
diff --git a/config/version.mk b/config/version.mk
index 6e8b0d6..e2d8d41 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,20 +1,20 @@
# Versioning of the ROM
ifdef BUILDTYPE_NIGHTLY
- ROM_BUILDTYPE := NIGHTLY
+ ROM_BUILDTYPE := NIGHTLY
endif
ifdef BUILDTYPE_AUTOTEST
- ROM_BUILDTYPE := AUTOTEST
+ ROM_BUILDTYPE := AUTOTEST
endif
ifdef BUILDTYPE_EXPERIMENTAL
- ROM_BUILDTYPE := EXPERIMENTAL
+ ROM_BUILDTYPE := EXPERIMENTAL
endif
ifdef BUILDTYPE_RELEASE
- ROM_BUILDTYPE := RELEASE
+ ROM_BUILDTYPE := RELEASE
endif
ifndef ROM_BUILDTYPE
- ROM_BUILDTYPE := HOMEMADE
+ ROM_BUILDTYPE := HOMEMADE
endif
TARGET_PRODUCT_SHORT := $(TARGET_PRODUCT)
@@ -22,16 +22,16 @@
# Build the final version string
ifdef BUILDTYPE_RELEASE
- ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
+ ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
else
ifeq ($(ROM_BUILDTIME_LOCAL),y)
- ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d-%H%M%z)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
+ ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d-%H%M%z)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
else
- ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
+ ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
endif
endif
# Apply it to build.prop
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=OmniROM-$(ROM_VERSION) \
- ro.omni.version=$(ROM_VERSION)
+ ro.modversion=OmniROM-$(ROM_VERSION) \
+ ro.omni.version=$(ROM_VERSION)