[Android Q&A, Help & Troubleshooting] obsolete1:
I was so happy it started to compile again until...

Install: /home/robert/aokp/system/out/host/linux-x86/bin/aapt
target Export Resources: framework-res (out/target/common/obj/APPS/framework-res_intermediates/package-export.apk)
libpng warning: Ignoring attempt to set cHRM RGB triangle with zero area
libpng warning: Ignoring attempt to set cHRM RGB triangle with zero area
device/amazon/otter-common/overlay/cm/frameworks/base/core/res/res/values/arrays.xml:37: error: Resource does not already exist in overlay at 'shutdown_reboot_options'; use <add-resource> to add.
device/amazon/otter-common/overlay/cm/frameworks/base/core/res/res/values/arrays.xml:38: error: Resource at shutdown_reboot_options appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/cm/frameworks/base/core/res/res/values/arrays.xml:39: error: Resource at shutdown_reboot_options appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml:37: error: Resource does not already exist in overlay at 'shutdown_reboot_options'; use <add-resource> to add.
device/amazon/otter-common/overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml:38: error: Resource at shutdown_reboot_options appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/cm/frameworks/base/core/res/res/values-sw600dp-land/arrays.xml:39: error: Resource at shutdown_reboot_options appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/values/config.xml:92: error: Resource does not already exist in overlay at 'config_locationProviderPackageNames'; use <add-resource> to add.
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/values/config.xml:94: error: Resource at config_locationProviderPackageNames appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/values/config.xml:96: error: Resource at config_locationProviderPackageNames appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/values/config.xml:116: error: Resource at config_multiuserMaximumUsers appears in overlay but not in the base package; use <add-resource> to add.
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:51: error: No resource identifier found for attribute 'layout_childType' in package 'android'
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:62: error: No resource identifier found for attribute 'layout_childType' in package 'android'
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:75: error: No resource identifier found for attribute 'layout_childType' in package 'android'
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:80: error: No resource identifier found for attribute 'layout_childType' in package 'android'
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:100: error: No resource identifier found for attribute 'layout_childType' in package 'android'
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:41: error: Error: No resource found that matches the given name (at 'layout' with value '@layout/keyguard_multi_user_selector').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:55: error: Error: No resource found that matches the given name (at 'layout' with value '@layout/keyguard_widget_remove_drop_target').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:67: error: Error: No resource found that matches the given name (at 'layout' with value '@layout/keyguard_widget_pager').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:80: error: Error: No resource found that matches the given name (at 'layout_maxHeight' with value '@dimen/keyguard_security_height').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:88: error: Error: No resource found that matches the given name (at 'paddingTop' with value '@dimen/keyguard_security_view_margin').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:100: error: Error: No resource found that matches the given name (at 'layout_height' with value '@dimen/kg_widget_pager_bottom_padding').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:100: error: Error: No resource found that matches the given name (at 'src' with value '@drawable/keyguard_expand_challenge_handle').
device/amazon/otter-common/overlay/aosp/frameworks/base/core/res/res/layout-port/keyguard_host_view.xml:100: error: Error: No resource found that matches the given name (at 'contentDescription' with value '@string/keyguard_accessibility_expand_lock_area').
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1
make: *** Deleting file `out/target/common/obj/APPS/framework-res_intermediates/package-export.apk'

EDIT:

never mind...found out that my branches where not the same, resynced both branches and all seems to be going okay