Commit Graph

12 Commits

Author SHA1 Message Date
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
amzn-hdoke 1dfe65a3ef Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-04 15:47:17 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
amzn-hdoke d365ff51d6 [AWS][Gems] Fix for Linux Release Monolithic Builds (#1739)
* Add missing 3rd party deps to Metrics gem

Signed-off-by: dhrudesh <dhrudesh@amazon.com>

* Set AWSNativeSDK-linux revision to 5

Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-02 08:24:42 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-06-29 15:40:46 -07:00
John 0e0f266fdd Provisional implementation of PythonCoverage gem
Signed-off-by: John <jonawals@amazon.com>
2021-06-29 17:43:33 +01:00
amzn-hdoke d617e8765b Disable AWS gems for Linux and Android release monolithic builds (#1592)
* Disable AWS gems for Linux and Android release monolithic builds

* Update AWS gems add condition
2021-06-25 16:37:41 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
lumberyard-employee-dm 3b349e72a0 Adding QtForPython gem to the AutomatedTesting project 2021-05-28 01:17:57 -05:00
pappeste 69e79867be Making imported targets global, fixing identiation of the enabled_gems.cmake file 2021-05-27 20:12:48 -07:00
Nicholas Lawson c9d5d7fb77 The new gem registration and usage system
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00