tree 6b1573625cdc9cf9cd8054b76b7f898df46b7507
parent 2902d4585f2a60a91084e96d00f2ee8d8301bf65
author Ying Wang <wangying@google.com> 1418943232 -0800
committer Ying Wang <wangying@google.com> 1418944384 -0800

Fix using variable intermediates.COMMON before defining.

In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.

Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53