Merge "vendor/omni: Add GSM/CDMA specific makefiles" into android-4.3
diff --git a/config/common.mk b/config/common.mk
index 5d443f2..28235d4 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -47,7 +47,7 @@
# Additional packages
-include vendor/omni/config/packages.mk
-# Versionning
+# Versioning
-include vendor/omni/config/version.mk
# Add our overlays
diff --git a/config/version.mk b/config/version.mk
index 7f0ebe1..e6c3fab 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,7 +1,4 @@
# Versioning of the ROM
-PRODUCT_VERSION_MAJOR = 4
-PRODUCT_VERSION_MINOR = 3
-PRODUCT_VERSION_REVISION = 0
ifdef BUILDTYPE_NIGHTLY
ROM_BUILDTYPE := NIGHTLY
@@ -25,13 +22,12 @@
# Build the final version string
ifdef BUILDTYPE_RELEASE
- ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(TARGET_PRODUCT_SHORT)
+ ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
else
- ROM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_REVISION)-$(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
# Apply it to build.prop
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=OmniROM-$(ROM_VERSION) \
ro.omni.version=$(ROM_VERSION)
-
diff --git a/prebuilt/etc/init.local.rc b/prebuilt/etc/init.local.rc
index 8c2dc8b..9a26ee1 100644
--- a/prebuilt/etc/init.local.rc
+++ b/prebuilt/etc/init.local.rc
@@ -18,3 +18,11 @@
user root
oneshot
disabled
+
+# adb over network
+on property:service.adb.tcp.port=5555
+ stop adbd
+ start adbd
+on property:service.adb.tcp.port=-1
+ stop adbd
+ start adbd