Make android-init and lipstick device specific so that they can be built for...

Make android-init and lipstick device specific so that they can be built for all the watches in a single build tree

recipes-android/android-init/android-init_1.0.bb

@@ -6,6 +6,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 S = "${WORKDIR}"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 do_install() {
     install -m 0644 ${WORKDIR}/init.rc ${D}/init.rc
 

recipes-nemomobile/lipstick/lipstick_git.bb

@@ -11,6 +11,8 @@ PR = "r1"
 PV = "+git${SRCREV}"
 S = "${WORKDIR}/git"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 DEPENDS += "qtbase qtsensors qtdeclarative qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland qt5-qpa-hwcomposer-plugin qmsystem nemo-keepalive qttools-native"
 RDEPENDS_${PN} += "qt5-qpa-hwcomposer-plugin ${PN}-locale"
 # qt5-qpa-hwcomposer-plugin isn't detected to be needed at runtime by OpenEmbedded